Merge "Fix StagedInstallTest for devices without fs-checkpoint." into stage-aosp-tm-ts-dev