[automerger skipped] Merge "[DO NOT MERGE] Update P light greylist in AOSP"
am: 21593137ac  -s ours

Change-Id: I8bb94ce755d710460fcd74d2f8d4ab0d198ba533