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

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



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