[automerger skipped] Merge "Add icon logic for 5G SA mode" into rvc-qpr-dev...

[automerger skipped] Merge "Add icon logic for 5G SA mode" into rvc-qpr-dev am: df15ada5 am: 660623d8 -s ours

am skip reason: Change-Id Ic15d2a0ce0fd287f44e244d08ba399f83f6100b7 with SHA-1 e375b1e5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160609

Change-Id: I3da50ec87a6cfc52c052814b927c9a0a80bf3f09