[automerger skipped] Merge "Add icon logic for 5G SA mode" am: 4686f915e1 am: f0a12b7b73 am: 76461053cc am: 4285a9a9cd -s ours

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

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

Change-Id: Ia0dc995119320e48808154383046521fd8370ffd