Merge "Update callsites for leashes in a transition" into udc-dev am: 3e130b12 am: a8361d0a

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



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