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: 02457d1c am: 979974f1

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



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