Merge "Support nesting in leaftaskfilter and make recents compatible" into udc-dev am: 7b5c9c27

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



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