Merge "Update bitrate modes for opus encoder in media_codecs_sw.xml" into qt-dev am: 596842a20b am: 5446b430ad
am: d6362d1454

Change-Id: I356b43d5de4829c4848be284ea1bfb6a586d7091