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

Change-Id: I5db1d32b6141653e7971c4f1dd9931d4042bb19b