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: Iaaac071b8bf9742fea50780f021aad8ba2aff618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>