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

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



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