Merge "@hide some APIs that will not be used in Android R" into rvc-dev