[CDM] Perm Sync toggle fixes

Bug: 290063372
Fix: 300388336

Test: m
Change-Id: Ia1dd9c913f2fa5bc64c9806b515e93265371814e
2 files changed