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

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



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