Merge "Merge "Modify PackageManagerPerfTest to work by itself agian" into rvc-dev am: aa3a470151 am: 1826dc753c" into rvc-d1-dev-plus-aosp