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

Change-Id: I1e83b616a66ce3e18c3e7eb1f25fe5493ce4fbb9