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: 0906b5f8

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



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