Merge "Killing the client process only if the uid matches" into main am: f61f288e

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



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