Merge "Ensure that the device key is deterministic" am: eb35596a5a am: 1b95dd2809

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

Change-Id: Ia615dc8f8f2e9be9ad5316656e18e026d3544887