Merge "AOSP/UnifiedEmail - Made changes to test UnifiedEmail. Bumped the targetSdkVersion 28."