Merge "IMediaMetadataRetriever: Remove implicit display size resize logic" into oc-mr1-dev
am: 46c17d1375

Change-Id: Id2ade67a8e5093aa96bc3579d6243679eca05fac