Merge "fix use-after-free in adbd_auth" am: 8e3f9dc03d am: 0522e004bd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1539159

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e087b228e84ace35c5b89acd8ef226a5c99a084