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

Change-Id: I2599a62b1e1042b9cbcb6fcac2d754b8fb177758