Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev am: 1c15ca32

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

Change-Id: I8d36653e74adbb13144b2d65a58e124983b5e615