Merge "Add icon logic for 5G SA mode" am: 4686f915e1

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

Change-Id: Idc1abcf67c6b2fdf804c67a142864d73b65308da