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

Change-Id: Id7da1bc58c6b33cb3bece75e023561a4add93ad4