Merge "[adb] fix signature check" am: 4b8ddb7df3 am: 7d1c5b5e1d am: d1a88142a6 am: d15cef7eb5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1400967

Change-Id: If379625ad5994b7660a6f2de7e1ef7e901f5ebb2