Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
am: 3d558d8dd8

Change-Id: I2a05c3b5cbfe1f8bbd92ac85bc7544ab2c18b177