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

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

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



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