[automerger skipped] Add wifi to nearby devices permissions am: efd83ae3 am:...

[automerger skipped] Add wifi to nearby devices permissions am: efd83ae3 am: 3ffc1b32 am: d7c19204 am: ff90ca7c am: b9749dc9 -s ours

am skip reason: Merged-In I2ecd22f9fe95a78b220b6d5f62762e98c1641939 with SHA-1 4f2ec2d0 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/1865933

Change-Id: I40e9603f522b50dbeb77e6d2c8ae42717327dfab