Merge "Killing the client process only if the uid matches" into main am: f61f288e17 am: 2acf9ad091

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

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