Merge "FRP: Add migration for upgrading from a version without FRP credential"...
Merge "FRP: Add migration for upgrading from a version without FRP credential" into oc-mr1-dev am: 4996a358
am: ee5e0217
Change-Id: Ibd8827de410a337eb0d469392cc49eefcd6ff1e3