Revert "Fixing the race condition in GenerateRkpKey"

This reverts commit 0f62195535139026d35e831ccf329f8204781430.

Reason for revert: Breaks non-RKP systems

Bug: 190222116
Change-Id: I7e31a3045caa7b8bb0e34c8d1e266c104a627324
Merged-In: I7e31a3045caa7b8bb0e34c8d1e266c104a627324
2 files changed