Merge "Add locking to CredentialManagerServiceImpl Test: Built & deployed locally Bug: 253155340"