[automerger skipped] Merge "Fix UnsupportedOperationException" into udc-dev...

[automerger skipped] Merge "Fix UnsupportedOperationException" into udc-dev am: 2c970648 am: 7ea85cdd -s ours

am skip reason: Merged-In I1afae70422a8592f7c255d3ac8f16d53f3b8639e with SHA-1 406d51ad is already in history

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



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