[automerger skipped] Merge changes from topic "nearbyWifi" am: 5b4121cb am:...

[automerger skipped] Merge changes from topic "nearbyWifi" am: 5b4121cb am: b437d7d8 am: d179f2e7 am: c8f667a1 am: 3eb30d1b -s ours

am skip reason: Merged-In Iff1894a545889230c08578d8ae163116152ab28a with SHA-1 fe4797b6 is already in history

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

Change-Id: Ic69fb750c0dc895503919e0b843d102e8a719bfe