[automerger skipped] Merge "PackageManager: Add "-a" to list packages" am: a3a0c28d15 am: e7a5d3c143
am: 89cebe8705  -s ours

Change-Id: I64dbd9c472321c33f8e14d864f480a97df05236b