Merge "Do not kill the server process itself" am: b38b1408 am: 629a3621...

Merge "Do not kill the server process itself" am: b38b1408 am: 629a3621 am: 590b5a3d am: 7bc3c2cf

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



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