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

Change-Id: I2322fc8152f23903a877a00a7d98a478c540d823