[automerger skipped] Merge "Control audio HAL services in start/stop" am:...
[automerger skipped] Merge "Control audio HAL services in start/stop" am: 07ccf08a am: 945ee83f -s ours
am skip reason: Change-Id I39878b978b47a169c4fe446c43d7347809d15e06 with SHA-1 6025b731 is in history
Change-Id: Ie54f5b8f6c5a5a979d9a48002bc4af7ed0261af7