[automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a am: cc91b63c -s ours

am skip reason: Merged-In Ic63910c870837f5b37e4407ba5b3c7629e925c17 with SHA-1 6167665b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500

Change-Id: Ia7dc1f1dd76688109812a9daf3c12350c287e2a3