Merge "Fix exception in getting capabilities" into udc-dev am: e8151bf2

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



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