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

Change-Id: Ifc02a70713a1dcaad612ec99684b60ce9dc12c7c