Merge "fs_mgr_verity: fix androidboot.veritymode=enforcing doesn't work" into oc-dev