Merge "Show Hotspot network icon (Wi-Fi Slice)" into udc-qpr-dev am: f5023f38

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24533568



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