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: Ia0110b76b12ea03e84e7eab37818a2edbf654efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>