Merge "Add icon logic for 5G SA mode" into rvc-qpr-dev am: df15ada5ea

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

Change-Id: I30d1be91c5259a8c6fe57925c82c63e564a57131