fix(Cloud Databases): Key protect revert fix

[lornakelly]

Community Note

• Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
• Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Revert part this PR #5798 to address this bug #5863
Keep acceptance test edits as those are still applicable

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccIBMDatabaseInstance_Redis_Basic'
== RUN   TestAccIBMDatabaseInstance_Redis_Basic
=== PAUSE TestAccIBMDatabaseInstance_Redis_Basic
=== CONT  TestAccIBMDatabaseInstance_Redis_Basic
--- PASS: TestAccIBMDatabaseInstance_Redis_Basic (860.29s)
PASS
ok      github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/database        864.981s

$ make testacc TESTARGS='-run=TestAccIBMDatabaseInstanceRedisImport'
=== RUN   TestAccIBMDatabaseInstanceRedisImport
=== PAUSE TestAccIBMDatabaseInstanceRedisImport
=== CONT  TestAccIBMDatabaseInstanceRedisImport
--- PASS: TestAccIBMDatabaseInstanceRedisImport (431.23s)
PASS
ok      github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/database        438.401s

$ make testacc TESTARGS='-run=TestAccIBMDatabaseInstanceRabbitmqImport'
=== RUN   TestAccIBMDatabaseInstanceRabbitmqImport
=== PAUSE TestAccIBMDatabaseInstanceRabbitmqImport
=== CONT  TestAccIBMDatabaseInstanceRabbitmqImport
--- PASS: TestAccIBMDatabaseInstanceRabbitmqImport (492.87s)
PASS
ok      github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/database        498.222s

$ make testacc TESTARGS='-run=TestAccIBMDatabaseInstancePostgresImport'
=== RUN   TestAccIBMDatabaseInstancePostgresImport
=== PAUSE TestAccIBMDatabaseInstancePostgresImport
=== CONT  TestAccIBMDatabaseInstancePostgresImport
--- PASS: TestAccIBMDatabaseInstancePostgresImport (561.86s)
PASS
ok      github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/database        582.950s

$ make testacc TESTARGS='-run=TestAccIBMDatabaseInstanceEtcdImport'
=== RUN   TestAccIBMDatabaseInstanceEtcdImport
=== PAUSE TestAccIBMDatabaseInstanceEtcdImport
=== CONT  TestAccIBMDatabaseInstanceEtcdImport
--- PASS: TestAccIBMDatabaseInstanceEtcdImport (649.21s)
PASS
ok      github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/database        655.110s

$ make testacc TESTARGS='-run=TestAccIBMDatabaseInstanceElasticsearchImport'
=== RUN   TestAccIBMDatabaseInstanceElasticsearchImport
=== PAUSE TestAccIBMDatabaseInstanceElasticsearchImport
=== CONT  TestAccIBMDatabaseInstanceElasticsearchImport
--- PASS: TestAccIBMDatabaseInstanceElasticsearchImport (499.18s)
PASS
ok      github.com/IBM-Cloud/terraform-provider-ibm/ibm/service/database        (cached)
...

[omaraibrahim]

LGTM