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

This reverts commit 17d97920bd4dfbed99da168ff223801acdb054d7.

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

Change-Id: I9af7f8b9af1a6279f2b9f1249824da705164c6b5
1 file changed
tree: fb7e92ad156f80ec4686c2e3b43e8b6cb086c47a
  1. core/
  2. services/
  3. tests/