Merge "Make remount into checkpointing for ext4 userdata a no-op"
am: dbee3618be

Change-Id: I48aca418c618529f791b4f828fd6b39bce827a75