Merge "Merge "Revert "Revert "Use PM#isSameApp instead of...

Merge "Merge "Revert "Revert "Use PM#isSameApp instead of getPackageUidAsUser.""" into udc-dev am: 2ab33f72 am: f8f1b357" into udc-d1-dev-plus-aosp am: effc7a18

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22897479



Change-Id: Ie061401d40c3feead674a147f6067b8ddd0e437a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>