Merge "Fix some visibility issues with tasks & task overlays" into tm-qpr-dev am: 3dcd9ed2

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



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