Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"

This reverts commit aeac0619dff98dbc1ca086da3178caf5a7d35034.

Reason for revert: merge failure in other branches

Change-Id: I601e674be41fc5d4c97bd8db54ab1982377455f1
2 files changed