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