[automerger skipped] Merge "Revert "Fixing the race condition in...

[automerger skipped] Merge "Revert "Fixing the race condition in GenerateRkpKey"" am: 17f9f3e8 am: 55525e68 -s ours am: 06420260 -s ours

am skip reason: Merged-In I917a61da612f21f9a0f783bea5d24270d4e1db42 with SHA-1 d05498b9 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727159

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1732234

Change-Id: I7732e0963faab7a0015742c01db5143c73ff501e