Merge "Fix MimeUtils.guessExtensionFromMimeType() for non-lowercase mimeType." am: e613f824fc
am: 5346901cca

Change-Id: If7a26034d3740e493b1cb588403b97a59882d649