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

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



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