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

Change-Id: I7eba42061f65b4bb10e43fc9b01de45329062aa3