[automerger skipped] Merge "Revert "Revert "Telephony light grey list clean up for Q""" am: d4e2c6cd5a am: 39cc174191
am: 40e6f7ed00  -s ours

Change-Id: Ic112a07423c7d075e67fda370026de2c09aded9b