Merge "Merge "Consider adjacent launch target when recycling an existing task" into tm-dev am: a5619e3f am: 986716f1" into tm-d1-dev-plus-aosp am: 6ba1c53c am: 2ab7eacb

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



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