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