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

Change-Id: Ia7b614118cf1b2d1a98f2346e2d21043bcf3ab46