[automerger skipped] Fix ADB key file reading am: 31100f10 -s ours am:...

[automerger skipped] Fix ADB key file reading am: 31100f10 -s ours am: eff9338f -s ours am: 71d2d735 -s ours am: 7360d7b1 -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: Ib6f5c8f7301c277653a7fbbfb5d362c0ed139657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>