Merge "Revert "AOSP/Email - Bump targetSdkVersion to 28."" am: b0378c8a93
am: 72a9ebeeb4

Change-Id: I296357631a0f607b0ab16c2c5aa635483e901e8e