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

Change-Id: I169da87e2aca3b5146e91da4c635f583af94b27b