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: 95588dbd am: 9cb8cc40 am: 9937048d

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



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