[automerger skipped] Merge "Telephony light grey list clean up for Q" am: b9749f750f am: 700b5c3062
am: 6ea046e734  -s ours

Change-Id: Id6184d2a466f9b4dfaa5e6a9ace4dd6e04505132