[automerger skipped] Merge "Added the high usage hidden APIs back" am: 94189968e5 am: 6158555b71 -s ours
am skip reason: Change-Id I1ccfbe269f3d9b91b715c20bd2f200cfb20e2a8c with SHA-1 ff8275e6b9 is in history
Change-Id: I8d45e4b39c1d3c850ca482e59d4de5f395d3e53f
This commit is contained in: