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 am: aa0cb2b9

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



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