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 am: 8a3bede4

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



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