Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev