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

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



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