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

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

Change-Id: I620285a9617fd377eacde094c0c425b60534f079