Merge "fs_mgr: set ext4 fsverity feature bit"
am: 2eca761ee5

Change-Id: I9e4b8240d0270011ea4e2fb06c48ade93b89c3ff