Merge "Remove stale profile from CredentialManager" into main am: cc4b23c710 am: b8c3222c78

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

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