[automerger skipped] Merge "Move hidden APIs into system APIs" am: c606db86c8 am: 44676f50d4
am: e8c1f1222c -s ours
Change-Id: I4e5a889457bb67aae101866ca7d88e0fa399bb39
This commit is contained in: