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

Change-Id: I6c8bdd4d4df115abe6fd1914d21019da8930c8be