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: I245f2ba55265dd345ba51f5a8c6e5657a2b4f1fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>