Revert "Update clearData flow for notification settings"

This reverts commit 224ef13774019a91bac24c60ba89fc21a5978e16.

Reason for revert: b/130908336 - breaks tests

Change-Id: I124330a970bfca6a9e2db10415c498a1f45580ff
Bug: 130908336
3 files changed