Revert "[NS A26] Move available callbacks out of the rematch computation"

This reverts commit e63d4bb9.

Reason for revert: Toggling wifi on/off causes networking to
 stop working with these four patches applied.
Bug: 146230156

Change-Id: I9af7f8b9af1a6279f2b9f1249824da705164c6b5