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

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

Change-Id: I53a45481ab84954d87605e2799894cc5967fcd25
Signed-off-by: Automerger Merge Worker <[email protected]>