Merge "[b/109850442]Fail to adjust volume when connect Ampplifier.]" am: 36ee8e0244 am: 1506f83f4f
am: 61e22fedde

Change-Id: Iab4d98dd5f3a0aa2b52d5a0283fdf1486b0388c3