Merge "Save PackageDexUsage on PMS shutdown"