[automerger skipped] Merge "[CDM] Add Permissions Sync toggle" into...

[automerger skipped] Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f25 am: e0cce7bf -s ours

am skip reason: Merged-In I75d4370eed98275e2f99d65620229bdb57193fb8 with SHA-1 756d23ca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24708184



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