Move notification logic into ChangeNotifier

Bug: 66831
Change-Id: Ia92135ae35edc53691c7f420d67445c9baf8e925
Merge "Move notification logic into ChangeNotifier"