[automerger skipped] Rename crypt_keeper_* strings that are still used am: 64dc746a68 am: cc91b63c1e -s ours am: 799f84fd1c -s ours am: af1aa542b0 -s ours
am skip reason: Merged-In Ic63910c870837f5b37e4407ba5b3c7629e925c17 with SHA-1 6167665b8f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945500
Change-Id: I00902cf223d3d52319e8b38a7ca3f47aadbc351b
This commit is contained in: