[automerger skipped] Merge "mediaswcodec: Set "default" as preferred service" am: 124176d86b
-s ours am: bd14792a21
-s ours
am skip reason: Change-Id Iebcd89bfa38de3c10b79f878462ba2af347ad332 with SHA-1 0c16dbe690
is in history
Change-Id: I71d7483845ce91fabe8ba10934a25b6a676f16ec
gugelfrei
commit
6238fa1d80