Merge "Refactor fs_mgr_update_verity_state()" am: 5272f9b017 am: 99331422e0
am: 5f2cdb7ac8

Change-Id: I4db7b0041df6eac775ddea4523435cf2a818e714