[automerger skipped] New runtime permission NEARBY_WIFI_DEVICES am: a8395ffa...

[automerger skipped] New runtime permission NEARBY_WIFI_DEVICES am: a8395ffa am: 82e8d961 am: 63ec453b am: f1703ffa am: 25270743 -s ours

am skip reason: Merged-In I3f827be6219b5bb1595744e20b316d2b968e022d with SHA-1 8ee4d937 is already in history

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

Change-Id: Ia5d2111f1e8c8d5d2ab68742a3a0bbbfd7e40f79