Merge "Rename pmInternal#getPackageUidInternal (3/4)"