Merge "Use AudioManager.MODE_NORMAL when selecting account from dialog." into lmp-mr1-dev