Merge "Merge "Remove @SystemApi from some constants for R." into rvc-dev am:...
Merge "Merge "Remove @SystemApi from some constants for R." into rvc-dev am: c48113aa am: 6f94e125" into rvc-d1-dev-plus-aosp am: f9e18c90 am: 5e5e66e1
Change-Id: I97dfde23de9b36502a2db52cc02c2f21c0aad9f9