Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: 3c7fce35 am: 25105f65 am: dfc1264e" into oc-dev-plus-aosp am: 7035d9a9 Change-Id: I97a0ca52a8e1d2dbccb9ff2263eec62772358df6