Merge "Migrate packages/apps/UnifiedEmail to androidx.test"
am: 75a854a2f2

Change-Id: I697e2bd8f67a79ed2e7cb5ab46411946f719dbb1