[automerger skipped] Merge "AudioService: fix AudioProductStrategy matching rule" am: c48b0c9e96 am: 4681122d1f -s ours
am skip reason: Change-Id I377e840b18443c33fb0b562b27fbc706aaeb8055 with SHA-1 e9e26309fd is in history
Change-Id: I32675b917eb2ea5547c8e6f11447e163c839d448
This commit is contained in: