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

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

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



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