Merge "For emulator builds preopt system apps even if doing eng build"
am: 6dfd788fda

Change-Id: I5556244da69ca46583a63cfa83a321efa14b2381