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

Change-Id: I17fee4991fbe3a8987710be55e73898c1abebe82