[automerger skipped] Merge "Add new wifi nearby devices app-ops" am:...

[automerger skipped] Merge "Add new wifi nearby devices app-ops" am: b05265ac am: 29c470eb am: 525c5f88 am: 19d3cbf9 am: fa8304c9 -s ours

am skip reason: Merged-In Ib720a4edfe89ad599b02c0e4b5e18c98a39dc8a5 with SHA-1 aeca54e8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1863260

Change-Id: Ie3fefc02de304c4b60b4bd739bb9beee38b04907