[automerger skipped] Merge "Don't wait after SIGKILL when freeze-killing" into...

[automerger skipped] Merge "Don't wait after SIGKILL when freeze-killing" into udc-dev am: f267b126 am: 47ede514 -s ours

am skip reason: Merged-In Ib4cc2e31190338b565e4a89acce64d9ae52b19c9 with SHA-1 6c4c4a59 is already in history

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



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