Merge "AOSP/Email - Bumped the targetSdkVersion to 24 (maximum version) across Email and UnifiedEmail with minimal changes."