Fix restore credential manager providers

Fixes a race condition that prevents the
credential manager providers from being
restored in a backup.

Test: manual + unit + cts
Bug: 318729606
Change-Id: I980dcc6e88b6710d9f7d084c9968395a597630df
2 files changed