Merge "AOSP/Calendar -Added TEST_MAPPING file and "LOCAL_COMPATIBILITY_SUITE := general-tests" to enable presubmit tests for Calendar."