[automerger skipped] Merge "Control audio HAL services in start/stop" am: 522e96f252 am: 0d3e83d741 -s ours

am skip reason: Change-Id Icb6eeddfa48b1a49a4d48baae41f9086eb83a9ca with SHA-1 4da7af2ade is in history

Change-Id: I59ffff3122f3a9c9768095d08f54ba6c706f0876