[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add Wi-Fi Scanning notify to QS Internet Dialog" into sc-qpr1-dev am: 92129726 -s ours am: fcc312c8 -s ours am: a10f6e2c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9d72169bd51947c49deff7fadcabb398e244bb6c