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

Change-Id: Ic6fb07bb8e5cb94df276b7dfb3c40cb5e2325581