[automerger skipped] Merge "Add icon logic for 5G SA mode" am: 4686f915 am:...

[automerger skipped] Merge "Add icon logic for 5G SA mode" am: 4686f915 am: f0a12b7b am: 76461053 am: 4285a9a9 -s ours am: 289e0a2b -s ours

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

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

Change-Id: I180664fa94212751f5c7d7539bf2b160300db755