Merge "MimeMapImpl: Tweak message exception when resource not found."
am: 5fa7594bf8

Change-Id: I8222ef00bf44588ca22d0572aee324f6f340d525