[automerger skipped] Make ext4 userdata checkpoints work with metadata encryption
am: d3aee48096 -s ours
am skip reason: change_id I24387a2943dce28b918c34894f24911b20429be7 with SHA1 323959ea27 is in history

Change-Id: Ic058471719ec7d74999af06bd5f003d5360b888f