Merge "Tests incompatible with Q because MimeMap was recently added." into...
Merge "Tests incompatible with Q because MimeMap was recently added." into rvc-dev am: bfadf609 am: 9d576b58 am: 37da46f9
Change-Id: Id90d04fa42dd654ae8a9788ec8a2175d0859410e