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

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



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