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

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

Change-Id: I1e20cc061238e97c80ad87ca6fdc0f3c17309e22