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

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



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