Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev am: 9b1a9b4fb9
am: 729cb8b2b5

Change-Id: If4ab02ad02b39e197b15d3b1b9c9eef6e4a87cdd