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: 4497e41a am: 8bf64481

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



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