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: 5899fc1a am: d4a17092

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



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