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

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



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