Merge "Revert "Revert "Telephony light grey list clean up for Q"""
am: d4e2c6cd5a

Change-Id: Ibf189b80ac8d2c86872642f4a9794d0daa1a6dd7