[automerger skipped] Merge "Add production GEEK validation code" am: 73e5c089e2 am: 4bd371e6a7 -s ours am: 929e3e8849 -s ours

am skip reason: Merged-In Id90a5206a9a77dfed8547b2e7444a1fedd2edf18 with SHA-1 f168275fd5 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1748444

Change-Id: I2b30a7745e724d4bbe89d9f38f4fab35754330a0