Merge "Do not change the leash after completion" into udc-dev am: 264de2e9 am: ad78b449

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



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