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

Change-Id: I25f567d0296a9ac8d66b00b3bc93dcdbf2ebc6bf