[automerger skipped] Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev am: dde9704664 am: 7d43cb0ae9 -s ours
am: 39a0ecec18 -s ours
am skip reason: change_id I8365a40298b752af4bb10d00d9ff58ce04beab1f with SHA1 236e5e800e is in history

Change-Id: I2596b55b73e6eb969fa9b8c596acf0329c36ac52