[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 am: 7dadb070 -s ours am: d1316b0c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7e70289ad0173719b33f9997ee549eeac1debf34