[automerger skipped] Add new wifi nearby devices app-ops am: b4933d744e am: e8a5bf3545 am: 0b632103df am: 44a90fb123 am: 1ad8a6078d -s ours
am skip reason: Merged-In I6002edfd951322d959cd8f4c7a06381badfd1660 with SHA-1 66dbc99136 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1863288
Change-Id: I65132c71120111ddb57efa8018f2b043229b3c6f
This commit is contained in: