Merge "Telephony light grey list clean up for Q" am: 71ca860ff7
am: 0daf5ca480

Change-Id: I5c18a432f3cf04f7071334e69c3726bc6775ee51