Merge "Merge "Modify PackageManagerPerfTest to work by itself agian" into...
Merge "Merge "Modify PackageManagerPerfTest to work by itself agian" into rvc-dev am: aa3a4701 am: 1826dc75" into rvc-d1-dev-plus-aosp am: a210278c
Change-Id: I3068ab1a30de84c2beb05bf7b1e1713d918b9b1a