Merge "Consider adjacent launch target when recycling an existing task" into...

Merge "Consider adjacent launch target when recycling an existing task" into tm-dev am: a5619e3f am: 986716f1

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



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