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

Change-Id: I891dd33a7e95b868f8c5c73b37f3730d2b7233ed