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

Change-Id: I6d2fc3d56893de56e45c9b70738da3d86e89c34d