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

Change-Id: Ia23066251baf4f1f876f7e80bfd31e465917d8dc