Merge "Move hidden APIs into system APIs"
am: 860d8d0d80

Change-Id: Ic35d305ce0a7e6d0472bfe76ee00034abdd918c5