[automerger skipped] Merge "AudioService: Add Hearing Aid Switch Control" into pi-dev am: 71cedf9b0c  -s ours
am: cd42fe9215  -s ours

Change-Id: I494cd66344971b813afb821494ed7d11f6b23994