Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" am: 6019991c6e
am: 4dd17998ed

Change-Id: I9e1cd04d0e324e58dfced430e10cb50a5ce24f21