They were added to the max-sdk-o in commit f23153f1 (in Q), but should have
been added to max-sdk-p as they were on the light greylist in P.
This is a cherry-pick of 092a0a25 from aosp-master.
Test: m
Bug: 124354830
Change-Id: I856b975b88bdc5eacc5e061ba196bd584ca78c73