[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 -s ours am: 11623073 -s ours am: 920207e8 -s ours

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

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



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