Merge "EmailTests: Use language level consistent with SDK version."
am: 1239cd59a0

Change-Id: I9d75533fc7889ea0c76acc27aeb871549d5007c8