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