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

Change-Id: I952c8bdb24555e2e1ae27280b97c33ae6e2660f4