Merge "EmailTests: Use language level consistent with SDK version." am: 1239cd59a0 am: dfa906a0fe am: b4a41eef0c
am: 1b70a229c4

Change-Id: I2709102fa0b374e6dbfe128776763d6edd99b7b6