Merge "Catch STHAL factory exceptions" into udc-dev am: 4d1298ee am: 1a687cc6

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



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