Merge "Add frame-rate requirement to MediaFormat used to find matched encoder" into marshmallow-cts-dev