[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add WiFi scan notify message...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Add WiFi scan notify message (QS Internet Dialog)" into sc-qpr1-dev am: 626348ae am: 9b48dae7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4dcb0671b9f9c46dc2e799b419041a19866a1370