[automerger skipped] Update the leash position when gaining a new control am: b033de9f -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: Id715bfacc462b372170ff3fd9fa9d595d250f80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>