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

Change-Id: Iba7f1a3bee1830193775139ba69cea854d65ae9e