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

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



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