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

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



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