Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev am: 8092f01ce1 am: d6d9f9e044
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14923499 Change-Id: I3bdcd8d62c26d067800bc0ca83b2fdef9256a0f5
This commit is contained in: