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

Change-Id: I7cedc10e4993c6348bfe3284d4daed05759174d4