BUG: 150476123 Test: atest PackageManagerShellCommandIncrementalTest Change-Id: I27b456134c4a6bdb88db3483d42cb024d432e698 (cherry picked from commit bf35024b)