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: 6b053386 am: c67d3d70 am: 9ff14d77
Change-Id: Iaa6664d72732c55025cdccbfbf51123c4ba56ea5