[automerger skipped] Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev am: 0d246eb9 -s ours
am skip reason: Change-Id Ied35da0eb7aba3daca7ed430f006bf1e90e21dca with SHA-1 cc2bf6b9 is in history
Change-Id: Icbdfeed345696ee24cf6bfc878eeaf036e218cc1