[automerger skipped] Merge "Delete hiddenapi-p-light-greylist." am: 6483ac1af4 am: 875940bd8a
am: e408299b69  -s ours

Change-Id: Ib68da76015f001c94ea9d97cd374eb0718336d01