[automerger skipped] Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev am: 0d246eb9 am: 1a7bb7d7 -s ours

am skip reason: Change-Id Ied35da0eb7aba3daca7ed430f006bf1e90e21dca with SHA-1 cc2bf6b9 is in history

Change-Id: I2bc18ffbd55baf82fde1fc6edebe66707aa433ec