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: ae770b34 am: 7fb69a99 am: aca31038

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



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