Merge "Decouple task visibility from surface life" into udc-qpr-dev am: b00e8f31a2 am: 4eef1be561

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

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