Merge "Fix a couple of NPEs in AdbDebuggingManager.AdbDebuggingHandler" into tm-qpr-dev am: 382b7c8be1 am: dba149b848

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

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