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

am skip reason: subject contains skip directive

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

Change-Id: I2207c42ed309567cb318785db39dc6a0f1d1d3fa