Merge "Sort hiddenapi-light-greylist.txt" into pi-dev
am: a74badbe26

Change-Id: Ib5d3e7b88977dbcbd7ce23564b6a8b7f7754566b