[automerger skipped] Merge "Move hidden APIs into system APIs" am: 01a8c6214e am: eaea5d929e
am: 35ae67807e -s ours
Change-Id: I4e5a889457bb67aae101866ca7d88e0fa399bb39
This commit is contained in: