Merge "fs_mgr: fs_mgr_update_verity_state cleanup" am: c35c609961
am: c59a33274f

Change-Id: Id9b45e3f603f70bb2d54ff80d20ddc84801619d5