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

Change-Id: I61ce181f8800331900926bcc29d5a066e183feef