[automerger skipped] Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9
am: 85705f38d1
-s ours
am skip reason: skipped by user bonianchen Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674 Change-Id: I57386b761ffbf62eee86d601f83c5fe59c9a59f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: