Merge "Fix Toggle Bluetooth test dialogs" into oreo-cts-dev