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

Merge "Merge "Disable context sync telecom code by default" into udc-dev am: e5257275 am: eeee7dfc am: 1ac91bc1" into udc-qpr-dev-plus-aosp am: 708b5197

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



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