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 am: 6bd23531
Change-Id: I641e6b1c306ea0515833a2fae77bc8da494ef966