Merge "Avoid empty mime type in media metrics records" into oc-mr1-dev
am: 621faa7cb9

Change-Id: Iacee46f1fb04e30b8395fc3f0132b9ce08eab823