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

am skip reason: subject contains skip directive

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

Change-Id: I98c807813a4c30867d37f7605e699df5e1f7acfb