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

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

Change-Id: I4bb7dbbf6ebaae9238b90cd47bb01fb69c534bbb