[automerger skipped] Remove duplicated sysprop am: 154c886a26 am: ceb4f07e2d -s ours
am skip reason: Change-Id I3682a2cc5d35cb34977fd9aa9d7c03765bdfbe6a with SHA-1 a38522744c is in history
Change-Id: I2f76bb8d028ab0b4e67d649268fad0168c181d0d
This commit is contained in: