Merge "Switch PackageStatusStorage to XML-based storage" am: 4e77ae6d1a am: 4a7e3de5e7 am: c1bf6505c8
am: 77fb4c5b0e

Change-Id: I60b2a91b48413358d8912c06c78a987aae01c490