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

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



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