Merge "Refactor fs_mgr_update_verity_state()"
am: 5272f9b017

Change-Id: I23151b9a2c7bf28e4f62dfdbf5049d0100241cf1