[automerger skipped] Merge "Use new DeviceConfig.SYNC_DISABLED_MODE_*...

[automerger skipped] Merge "Use new DeviceConfig.SYNC_DISABLED_MODE_* constants" into udc-dev am: a31862ea am: 2a54d664 -s ours

am skip reason: Merged-In I7ce69fca7c680e91938f1f7798f7f33bf28849a9 with SHA-1 a19c6e61 is already in history

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



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