[automerger skipped] Merge "Fixed that WiFi calling icon not shown" am:...

[automerger skipped] Merge "Fixed that WiFi calling icon not shown" am: cdc6dde9 am: 2c548461 am: 907d3b34 -s ours am: 3f7952ad -s ours am: 4be6e799 -s ours

am skip reason: Merged-In I973888430d382cafc8c4396b62c06235eaecbd49 with SHA-1 eee90d66 is already in history

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

Change-Id: I754d6669cf1ec1c2d900c8c7aba8cef485099eba