Merge changes I0416b6cf,If24852e3

* changes:
  Bluetooth: sync dialog layout for consistency
  Bluetooth: follow system theme in dialogs
tree: c03f28d2330fefa88d85b4708bca671063020ab3
  1. android/