[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 skip reason: Change-Id I623e52432fc820d302fcdbdb9a88a37deed455ae with SHA-1 a469edb1 is in history
Change-Id: Ib5d78e23f47f3124716a551d4acd23c2cc114dc9