[automerger skipped] Merge "[CDM] Support Perm Sync toggle setting" into...

[automerger skipped] Merge "[CDM] Support Perm Sync toggle setting" into udc-qpr-dev am: 92c6061e am: 9eae1a91 -s ours

am skip reason: Merged-In I4a921769b17bb8ec6e28822e9539665f029b35d7 with SHA-1 ba390e8c is already in history

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



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