Merge "Remove the layer of task overlay activities" into udc-dev am: af5033e8 am: 8fabdd50

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



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