Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp * commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350': b/2296110 Dialog for setting up dock audio.
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp * commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350': b/2296110 Dialog for setting up dock audio.