Merge "Merge "PackageManager: Skip dexopt on install for debuggable apps" am: 5faf7291f0 am: 09a80d1797" into pi-dev-plus-aosp
am: 99ebce82de

Change-Id: I3c6ceea3a14710b525f299e2f487f8416069df32