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

Change-Id: I97041177f6024522edf8fffef8480677e9674014