Merge "fs_mgr: set ext4 fsverity feature bit" am: 2eca761ee5 am: 1ec76699b9
am: 7674d1686b

Change-Id: I550fec3b893c9c697c1c61b35a976c102cb23e13