Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()"