[automerger skipped] DO NOT MERGE Provided temp solution for 5G+ icon not...

[automerger skipped] DO NOT MERGE Provided temp solution for 5G+ icon not shown am: 96932fec am: 27e6eca5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9685e965caf2d6e35308b5dccc382a7b00401482