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

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



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