Unify checks between this and *IncrementalTest.

Test: atest PackageManagerShellCommandTest
Bug: 160605420
Change-Id: Ic2db8b0f247c611451f23566daf524a897a872ff
1 file changed