Merge "Enforce secure FRP mode while changing credentials" into rvc-dev am: 0424c5cb62 am: 0ba1b88fc3 am: 49c3063b77

Change-Id: I8e9c87110c1e5754ce64a5c885e10f473b7548e7