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

Change-Id: I908154237fdf5dd7fbe4ce21a3ef1b5ae8f9da1a