Merge "fs_mgr: fs_mgr_update_verity_state cleanup"
am: c35c609961

Change-Id: Ifa979feb15b1435d33b423ecb5d8f3dd66ac98fd