[automerger skipped] Merge "Remove @SystemApi from some constants for R." am:...
[automerger skipped] Merge "Remove @SystemApi from some constants for R." am: decc3085 -s ours am: f11a7c5c -s ours am: 203b0ed6 -s ours
am skip reason: Change-Id Ibdcac557cf35e723f09a7b7a2e59c7deae1fc94e with SHA-1 c55b0155 is in history
Change-Id: Ic67e9e03cc7d6ff77aa10e7087f29973b838e604