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

Change-Id: Id8e846e4ddce700a6e811a6700794f80d119938c