Merge "fs_mgr: fs_mgr_update_verity_state take std::function" am: 2bbbd06a8a
am: 35a783ce9c

Change-Id: I6f286063df198baf0ff0fc9f3ef2892bd5a23427