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

Change-Id: I1f2552785cc8031e624fecf50982165d4524d918