Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6 am: a444b37d

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

Change-Id: I841cfec11bfb2e90ddcb26dde095dd71da235b87