Merge [Settings] Code refactor for combining TelephonyCallback with Lifecycle into tm-dev am: 3fc05a917e am: e8619c8d08 am: 13ae7a955c
This is to unstick Automerger. Bug: 230457013 Change-Id: If8bc472fbfe961daa48c64e37fe80a3cc0383bae
This commit is contained in: