Merge "Skip from copying preopted files if device is undecrypted" am: 17977d897e am: 38d1885b46
am: eff62aaaaf

Change-Id: Iaf7cd2b8329e5e49a70bb516bb016f0bdc08e0dd