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

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

Change-Id: Iabd4d4a98825903ea0aa11f7ba49a4e704e38500