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

Change-Id: I35da50b43ebef204d56c7e9e28173aba32f50f94