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

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

Change-Id: I05240ccbc78d57e53bd14756f5cfc13d081c9d4c