Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b...

Merge "Do not expose wifi slice when no permission" into tm-dev am: ccb8855b am: 9a8167a4 am: 4b648f33

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536305



Change-Id: I54252850287d893d1246fa9d04bb8c7ce34d2cfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>