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

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

Change-Id: I20ad89d1047717a8c5df66581be7014e3d10631e