Merge "Require password to FR in carrier demo mode"

Bug: 34341567
Test: manual - still builds
Change-Id: Ie450a97db5c3ce58a1a5e43334bb0546a3c48645
1 file changed