Merge "Avoid ArraySet#iterator in PackageManagerService"