Merge "Telephony light grey list clean up for Q" am: b9749f750f
am: 700b5c3062

Change-Id: I22775147345a2c2159f18c49a94ec7e9d2a314a3