Merge "Fix PackageManagerService onlyCore and factoryTest ordering" into rvc-dev