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

Change-Id: I1dad8c69b74d90fd216561afc1637835d57f0648