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

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



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