Merge "FRP: Add migration for upgrading from a version without FRP credential" into oc-mr1-dev
am: 4996a35843

Change-Id: I3d7d8255703d805e8d74a22e1ef8e1f8476960d4