Merge "Tests incompatible with Q because MimeMap was recently added." into rvc-dev am: bfadf609ca

Change-Id: I7d3e75dc0a55445377ad5b02910f204dee96c6a2