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

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



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