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

[automerger skipped] Add new wifi nearby devices app-ops am: b4933d74 am: e8a5bf35 am: 0b632103 am: 44a90fb1 am: 1ad8a607 -s ours

am skip reason: Merged-In I6002edfd951322d959cd8f4c7a06381badfd1660 with SHA-1 66dbc991 is already in history

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

Change-Id: I65132c71120111ddb57efa8018f2b043229b3c6f