Plus minor refactors Test: atest PackageManagerShellCommandIncrementalTest Change-Id: Ib3a1c7c45a4abaab793be73213545ce91c98510b
Plus minor refactors Test: atest PackageManagerShellCommandIncrementalTest Change-Id: Ib3a1c7c45a4abaab793be73213545ce91c98510b