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

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



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