DO NOT MERGE - Require password to FR in carrier demo mode

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

Change-Id: If696e5c5c806e31399e33a151b0d36e7a950ceb0
1 file changed