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
Change-Id: I8bab945bca33d7869dde215961308634a0e7932e