Merge "Use the same transaction to set position of the leash" into udc-dev am: f4f5ce43

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



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