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

[automerger skipped] Merge "Fixing the race condition in GenerateRkpKey" into sc-dev am: 9a9741b9 -s ours am: 34955f75 -s ours

am skip reason: Merged-In Ie34997a08aa743642c66a20c4b756cd47bff4af1 with SHA-1 5e43390b is already in history

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

Change-Id: I1429905b96866e0fe378392f8d0f190fe000b398