Merge "Only enforce secure FRP mode when in setup wizard" into rvc-dev am: c8983dbe am: 2e36e290 Change-Id: I3380a5a018d1ea8aa498e27ea9914cde6cd757aa