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

Change-Id: I52530b935c956e05661865b16b8dbcadee588ed1