Revert "Proxy notification improvments"

This reverts commit ac98aea2ed4de69a25cb72f389b999fa8ff5d4d2.

Reason for revert: b/118700922 (broken CTS test)

Bug: 118700922
Change-Id: I7d55365b3f64acd82e377dc973e2de5d654cc352
6 files changed