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

Merge "Better error message in case of multiple splits." into udc-dev am: 413bb027 am: 930da5ad am: 45b0f611

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



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