Merge "Implement GenerateUniqueId for PureSoftKeymasterContext" am: df2b4db4f0 am: 564c63ebf6

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1940395

Change-Id: I8750a44cabcd8211ad27d2dcad7664d94ae29427