[automerger skipped] Merge "Update the leash position when gaining a new...

[automerger skipped] Merge "Update the leash position when gaining a new control" into 24D1-dev am: c99c3114 -s ours

am skip reason: Merged-In I5ba0c33ca4542d27bb4dee4ce849f34721f20b14 with SHA-1 8fab6279 is already in history

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



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