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

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

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



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