[automerger skipped] Fix flaky test with enabling virtual sd card fail am: 6926437d17 am: c05c867d0c am: 4eca227a93 -s ours
am: 7cf1d07477 -s ours
am skip reason: change_id Iccb9e16650963c792d83c4fd89c43e5c2f6c7300 with SHA1 6926437d17 is in history

Change-Id: I482074245781d2222498cf1460d5cd588a0bf383