Merge "Mark fs-verity support for ext4 userdata if first_api_level >= R" am: b03ff7dbbf

Change-Id: If72620a065d2ae33a5a40bd28b04d3758ffbe6b5