[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 am: 559de303 am: 7e0149d2 -s ours am: 867ae7e3 -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: Iac7bcf78c9141b6f6aabc3c065839748ec172bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>