Merge "Move hidden API from vendor to light grey" into pi-dev
am: b622906dc5

Change-Id: I33b7b4afd232eb305fdb1dac42d7b8980ea1cbd6