Revert "Convert ENR expansion NotificationEntry usages to EntryAdapter"

This reverts commit 769529b3.

Reason for revert: Likely culprit for b/398827438  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I1e0589ccb44b96f4f784f3bdd0ec82003fc39bdd