[automerger skipped] Merge "Migrate packages/apps/Email to androidx.test" am: 2fe2bc7ebc -s ours
am: 4c3dc8daa5 -s ours
am skip reason: change_id Id4f25bf324a564afbaf9c726ea97fa33074d8660 with SHA1 29260c13d9 is in history

Change-Id: I60e369d5efbd2766a75fe2755cfc8e80a010872a