Merge "Use getCallingPid for pid instead of getCallingUid." into tm-qpr-dev am: d237ca1e5d am: 572d76935b

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

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