Merge "@hide some APIs that will not be used in Android R" into rvc-dev am:...
Merge "@hide some APIs that will not be used in Android R" into rvc-dev am: 5f3d66bf am: 5165e1a5 am: 870202b7 am: e787fc6a
Change-Id: Ia70694ab5493b8531a441db00118d4e33ad04e3a