Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev am: 1c15ca32c2 am: 9e5308a998
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646 Change-Id: I241d0be3660aa203625a4570e4328eb5fdc25169
This commit is contained in: