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

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

Change-Id: If69050b1d8c8d826915faef2e904e1789c24048c