Merge "Modify PackageManagerPerfTest to work by itself agian" into rvc-dev am: aa3a470151 am: d8d4d09bf8 am: 333d22bc0b

Change-Id: If45becbf28d04f620d0b83bec92852e3a444221e