[automerger skipped] Merge "Fixed data icon disappeared issue" am: a3fdb8f3...

[automerger skipped] Merge "Fixed data icon disappeared issue" am: a3fdb8f3 am: 8e11895a am: a5cf0962 am: 154ddcc7 -s ours

am skip reason: Merged-In Ia5c2e1e45f8e990e5a25181249acc2b98f812cf8 with SHA-1 13a48ad2 is already in history

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

Change-Id: I4e08698da3a3ed54522c72bff77f282dd0a11d34