[automerger skipped] Remove CryptKeeper am: 438c3af097
am: 94ebb2e9e5
-s ours am: 2ff19ce69b
-s ours
am skip reason: Merged-In I4aaf795e8cee1ff3cdd55a41c975273c8faeefa9 with SHA-1 f8ca0a448c
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1945498
Change-Id: Ib5c44454b76f8216dd306ba7cd3d398df18cd50e
This commit is contained in: