Merge "Revert "Make VZN 1839 use 5G UW icon"" into udc-dev am: 4fde0002

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



Change-Id: I0b10182bdaa723277582f0f3bca01d25bcbc8b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>