Merge "[DO NOT MERGE] Update P light greylist in AOSP"