Bug: 34341567 Test: manual - password is not required for regular user factory resets and is required in carrier demo mode. Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16
Bug: 34341567 Test: manual - password is not required for regular user factory resets and is required in carrier demo mode. Change-Id: Icadb6edb3d85ae58b45862c182b6b03bf2c3ce16