Merge "Fix CtsVerifier Bluetooth Device Picker View" into oreo-cts-dev