[automerger skipped] Merge "Revert "Telephony light grey list clean up for Q"" am: a18e095754 am: c16c2f7c8e
am: cd6874f0bf  -s ours

Change-Id: I893e59ad8c4eb5237bc36f4950140cd91fcae99d