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

[automerger skipped] Merge "[DO NOT MERGE]wifi: scan enhancement" into udc-d1-dev am: c2b2b84e -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/+/23237784



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