[automerger skipped] Merge "AudioManager: Add functional tests for productstrategy/volumegroup" am: 688857ea am: 99860281 -s ours
am skip reason: Change-Id Ia7e92ff37ff9c5e51bc2b5fe54b15c6338868b23 with SHA-1 8650e2d2 is in history
Change-Id: Ib1f85990a89677fe274f5818ce0bc8b081b15041