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

Change-Id: Id86ee7f84251e4fd4884dae7fab5677bed2c0501