Merge "Use PM#isSameApp instead of getPackageUidAsUser." into udc-dev