[automerger skipped] Merge "Fix ADB key file reading" into tm-dev am:...

[automerger skipped] Merge "Fix ADB key file reading" into tm-dev am: 9523639b -s ours am: ca5ac7e9 -s ours

am skip reason: Merged-In Iae955aca17e873288d58b16f184bd4d325d50d86 with SHA-1 efb8194e is already in history

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



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