Merge "PackageManagerShellCommand: implicitly add --wait for staged installs" am: 042ec2c190 am: 2fa3a111d1

Change-Id: I296dc864ae35b1de923f8d8e299717f1df2bf3ce