Merge "screenrecord should default to '--bit-rate 20M'" into oc-mr1-dev
am: 3c4d63ebff

Change-Id: If8e12439522b502c8805d237b9b15ad06b7c3fa2