Merge "Remove @SystemApi from some constants for R." into rvc-dev