Merge changes Ied254224,I3118af50

* changes:
  Reland mediaswcodec: Fix "default" as preferred service
  Revert "mediaswcodec: Set "default" as preferred service"