[automerger skipped] [DO NOT MERGE] Revert "Update the leash position when gaining a new control" am: a0c5f61154 -s ours

am skip reason: Merged-In I5ba0c33ca4542d27bb4dee4ce849f34721f20b14 with SHA-1 8fab62792e is already in history. Merged-In was found from reverted change.

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

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

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