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

Change-Id: I8822c50ee7d591f781fafb9b21dc9a54cdb8ec49