[automerger skipped] Merge "Fixed incorrect data icon when call received on...

[automerger skipped] Merge "Fixed incorrect data icon when call received on ESIM" am: b7dc3537 am: 007ac2aa am: 92a70e62 -s ours am: d080f7c9 -s ours

am skip reason: Merged-In I5ff7962ed270f449b90bf4c0d3c03390ffa9b709 with SHA-1 703f9631 is already in history

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

Change-Id: I42f47fec201d0405946c346e04128555c0ce65a9