Merge "Fix ADB key file reading" into tm-dev am: 9523639bb0 am: 559de3038a

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

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