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

Change-Id: I413ff7a0e759ae257d3be6fba180c220b15f07d2