Merge "Fix how taskview is used by controlsUi" into udc-dev am: 646c4f25

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



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