Merge "Organize incremental test plan for PackageManager"