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

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

Change-Id: Ie2798465753d7a6fd7d7e157fb528db6d17dbd89