Merge "Merge "Disconnect existing adb clients when adb grants are revoked" into udc-dev am: efc69469" into udc-dev-plus-aosp am: a1667595

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



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