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
Change-Id: Idc79c390d26eeead1c6cd954e4da29d0eae92cab