[automerger skipped] Fix ADB key file reading am: 31100f104b -s ours am: eff9338f2b -s ours am: 71d2d73532 -s ours
am skip reason: Merged-In Iae955aca17e873288d58b16f184bd4d325d50d86 with SHA-1 efb8194ec4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19049555
Change-Id: I9ccd52bb5bd8343f149427ca5a045ac64348038a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: