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

Change-Id: I3d4d18d09de7978499b7213868018ff946384aa8