Merge "Prevent ACTION_FACTORY_RESET from resetting device in a non-system user" into sc-dev