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

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



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