Merge "Skip service timeout if the host process has been killed." into udc-dev am: 08386a58

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



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