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

Change-Id: I4fa45bf6b1291132a9d4522e70b6498231025a42