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

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



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