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: f774d0d4 am: b77a8fa8 am: 0a9354d1

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



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