Merge "Update fs_mgr_update_verity_state() for new C++ Fstab"