[automerger skipped] Merge "[RESTRICT AUTOMERGE] Hide Wi-Fi Scanning message...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Hide Wi-Fi Scanning message when Location is disabled (QS Internet Dialog)" into sc-qpr1-dev am: f42de45d -s ours am: 61c456ea -s ours am: feeec784 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9e29479a569eb38f35844c92c59a433c61504f43