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