Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev

* changes:
  [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
  [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"