Merge change I80790bdb into eclair

* changes:
  b/2296110 Dialog for setting up dock audio.