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

Change-Id: Ib47eb6e938859418da1dd6543ecca329326d7885