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: Ifbb5e29b667e9492c8cf234d11d8b26c7972ddd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>