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: d90a9f5d am: 45c81729
Change-Id: I6b2e02b4c0a90ccc274fab53a8ae785627d748af