Merge "PackageManagerService: Avoid NPE in matchComponentForVerifier" into p9.0