Merge "Save PackageDexUsage on PMS shutdown" into oc-mr1-dev am: 7b7b99bf56
am: 3f081e345f

Change-Id: I18a4582776f8cacac98534f677db9508a4beeef4