Merge "Merge "Better error message in case of multiple splits." into udc-dev...

Merge "Merge "Better error message in case of multiple splits." into udc-dev am: 413bb027 am: 930da5ad" into udc-d1-dev-plus-aosp am: 5cb535e5

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



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