Merge "Merge "Fix CtsVerifier Bluetooth Device Picker View" into oreo-cts-dev am: 9a9874772a"