[automerger skipped] Merge "Show Hotspot network icon (QS Internet Dialog)" into udc-qpr-dev am: 40e7b45b am: dce757ef -s ours

am skip reason: Merged-In I2ab807ad62aaa69c0f254bfc43baa8d18b7f9afe with SHA-1 9d10009b is already in history

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



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