Merge "Ensure SSID is not exposed to apps without correct permission" am: 674a907cc4

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

Change-Id: Ib93d650bc77e2b5daa75ce8f79bbd392e1f5c46c