Merge "Delete hiddenapi-p-light-greylist."
am: 6483ac1af4

Change-Id: If6a8095198fdeec1874f5fb1def494a9a4ffc152