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

Change-Id: Iaf81cdd7565acdc0c12b1a0ab471c9efa7391ad3