Merge "Killing the client process only if the uid matches" into main am: f61f288e17 am: 6d7af5fefa am: ce9229edcf

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

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