Merge "AOSP/UnifiedEmail - Made changes to test UnifiedEmail. Bumped the targetSdkVersion 28." am: 9cacebc8e5 am: 81bd0480b8
am: b8b53769d1

Change-Id: I6cbaee9c8a17654334fe528516cd01ec553878a4