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

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

Change-Id: Iefec7643bc26a244a107eaadda7b55667258dd8e