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: eeee7dfc am: 1ac91bc1

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



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