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

Change-Id: I0c896296ec75c92073118453a3060f3e039a19f0