Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"

This reverts commit 81d230b250c3a42ca2e99b2d1530a1f7a3845414.

Reason for revert: merge failure in other branches

Change-Id: If8661f5f321f22df96aab54eb8ba967c232348ac
2 files changed