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: Ibd37ef3ede3064f42199199056e95c6c83e232fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>