[automerger skipped] Merge "Fixing the race condition in GenerateRkpKey" am: d1de4cc6 am: 2c455e5f -s ours am: 498fccac -s ours am: 764dab81 -s ours

am skip reason: Merged-In I917a61da612f21f9a0f783bea5d24270d4e1db42 with SHA-1 d05498b9 is already in history

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

Change-Id: I766e0f69e7479e9787db7acdd7c85f136891288c