Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: e9e1f5afa7 am: da74454c03 am: a883c2c975 am: e165469aaf am: 93589b089f

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

Change-Id: I6ef491a28fab8be9ba0e8ff2f4e6a10fec1f5690