Merge "Skip from copying preopted files if device is undecrypted" am: 17977d89 am: 38d1885b am: eff62aaa am: 3e499f7f Change-Id: I97041177f6024522edf8fffef8480677e9674014