[automerger skipped] Merge "Add PackageDexUse file to dumpstate" am: b5075fb211 am: f614380ea3 -s ours

am skip reason: Change-Id If5d2bfa005350d36006c07cdd38bf2c01417fd18 with SHA-1 f84d369ea4 is in history

Change-Id: I32b98a09675cb6308c15d3205777a0d819d1a969