Merge "Add NEARBY_WIFI_DEVICES to shell permissions for CTS" am: 5d4effbd23

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

Change-Id: I02f3fdae19af3ae5634b1aeff52b3510ba291c78