Merge "Disable context sync telecom code by default" into udc-dev am:...

Merge "Disable context sync telecom code by default" into udc-dev am: e5257275 am: 0637b64d am: 6e192186

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23061738



Change-Id: I8103ffdbb0e0006132097163242af609c8e936ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>