Merge "Do not crash clients when service is not available" into udc-dev am:...

Merge "Do not crash clients when service is not available" into udc-dev am: 5434a53c am: 3c8bfedb

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



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