[automerger skipped] Merge "[DO NOT MERGE]wifi: scan enhancement" into...

[automerger skipped] Merge "[DO NOT MERGE]wifi: scan enhancement" into udc-qpr-dev am: 180a8929 -s ours

am skip reason: Merged-In I2f9cdb638dcb1f98113f39b60a96b0d1e8b22d8c with SHA-1 d02b24ab is already in history

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



Change-Id: Ic15edcac39cdc2b046e4a43e9ebe40a2076b9dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>