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

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

Change-Id: I4cb56a64a8f1d413e2e2f08d4dd0b6d000951022