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

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



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