[automerger skipped] [DO NOT MERGE]wifi: scan enhancement am: 0fd8ba40 -s...

[automerger skipped] [DO NOT MERGE]wifi: scan enhancement am: 0fd8ba40 -s ours am: 01a74397 -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: I031a55b6befa857d60571518514cb4820d0e6e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>