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

Change-Id: Ia022da7e329e7de346f55a980aaa924e9248d16a