[automerger skipped] Merge "Run DownloadManagerTest on secondary users." am: ad4f4658c4 am: d25468d8ae
am: f8fc4e48d8 -s ours
am skip reason: change_id I7c8c4788b103d381b3ef375cceb5f73835997eb4 with SHA1 b9b1816cee is in history

Change-Id: Ic841131f33a192d59b062fd964717184af4f4398