[automerger skipped] Merge "Move hidden APIs into system APIs" am: 860d8d0d80 am: c3375240ba
am: af2218bde6  -s ours

Change-Id: I4e5a889457bb67aae101866ca7d88e0fa399bb39