Merge "[CDM] Support Perm Sync toggle setting" into udc-qpr-dev am: 92c6061e0e

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

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