Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev
am: 956491b867

Change-Id: Ib8dd7a7a1805f9a2b00525ae9bd6ebcbc572f2fa