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

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

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



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