[automerger skipped] Merge "Added the high usage hidden APIs back" am:...
[automerger skipped] Merge "Added the high usage hidden APIs back" am: 94189968 am: 6158555b -s ours am: d04f0081 -s ours
am skip reason: Change-Id I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c with SHA-1 ff8275e6 is in history
Change-Id: I95bffb131bbc8e327f975a9e4d8c4a7127e99440