[automerger skipped] Merge "@hide some APIs that will not be used in Android...
[automerger skipped] Merge "@hide some APIs that will not be used in Android R" am: 31486405 am: 2a2cad3c -s ours am: 250d1288 -s ours
am skip reason: Change-Id I623e52432fc820d302fcdbdb9a88a37deed455ae with SHA-1 a469edb1 is in history
Change-Id: I2fcc4023939bc655f300ed7d0efb63c55803eda1