Merge "Fix javadoc for PackageManager#getNameForUid()"