Merge "Merge "reduce the visibility of framework-minus-apex" into rvc-dev am: e06e29bb am: 9138b8de am: d630e8cf" into rvc-qpr-dev-plus-aosp