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: ad525095 am: 3573c403 am: 4e6d26c9
Change-Id: I2b1cb42419412b1ef0a8f926a944599a50c8745a