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 am: f4312ccb
Change-Id: Ief2110721872003dfc4a3fc31e91ef8eec3926cb