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

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



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