Merge "@hide some APIs that will not be used in Android R am: a469edb1 am:...
Merge "@hide some APIs that will not be used in Android R am: a469edb1 am: 0e1d5d28" into rvc-d1-dev-plus-aosp am: 403701a9
Change-Id: I17852162bee6a3447c371076d9ce3f27e9d3ecd7