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

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



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