Merge "Add permission checking to WifiDialogActivity" into sc-dev