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

Change-Id: Ia365c57eb14408a346e7ac40eb99ad15b9be87a0