Merge "AOSP/Email -Added TEST_MAPPING file and "LOCAL_COMPATIBILITY_SUITE := device-tests" to enable presubmit tests for Email." am: 849ada38dc
am: 2a381e9287

Change-Id: I2c55389c5dfa88eba041c5c9a21df52b56d9f548