Merge "Fix StringIndexOutOfBoundsException in PackageManagerService"