Merge "Fix ADB key file reading" am: f46a32f2 am: 930a17f7 am: f94c8e93

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



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