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

Change-Id: I7554d6526f69a9271bf9eabaeb90aaec8b0e57e3