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

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

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



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