[automerger skipped] Merge "Merge "[Wifi] Add LOCATION_HARDWARE to SysUI...

[automerger skipped] Merge "Merge "[Wifi] Add LOCATION_HARDWARE to SysUI permissions." into udc-dev am: 0f59388c am: bc3837be" into udc-d1-dev-plus-aosp am: 6e00b41a -s ours am: ec0cf229 -s ours

am skip reason: Merged-In I275adeaabb9fcda27ed66ab05442b48d4ac4613f with SHA-1 28ed4fcb is already in history

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



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