[automerger skipped] Merge "5G icon timer did't work after physcial channel...

[automerger skipped] Merge "5G icon timer did't work after physcial channel changed." am: c5486668 am: 1834737b -s ours am: 740777ce -s ours

am skip reason: Change-Id Ic9c3deffd1f86ae3d3620994c54d46932a79116c with SHA-1 0b70ede2 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1347344

Change-Id: Idc03003e4987430028394e12c117334e1595c1bf