Merge "Set skipUserSetup to false on financed devices am: 58418ba518 am: 4cb839544a" into rvc-d1-dev-plus-aosp