Merge "Support nesting in leaftaskfilter and make recents compatible" into...

Merge "Support nesting in leaftaskfilter and make recents compatible" into udc-dev am: 7b5c9c27 am: 849260a2 am: be9a7bb2 am: 80a922cd

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



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