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