Merge "Add missing fallback for tasks which can't be split" into udc-dev am:...

Merge "Add missing fallback for tasks which can't be split" into udc-dev am: ac39941f am: 0577d0be

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



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