Merge "Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: 3e1e0cd837" into tm-d1-dev-plus-aosp am: d8bcd8b4b5
am: e563a0a15a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674 Change-Id: I089be8d49dc94ab7bf6701f568c450f2b753ef88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: