am 2aa46d35: am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev

* commit '2aa46d3518ac7e91f4ae621f767646d6e4b0a120':
  add settings for dock audio enabled