Merge "Keymaster: Fix potential bug in extractUint32()/extractUint64()" am: 991650fd8a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1354466

Change-Id: I62eef90020161286035e667bf8f7c3c6f5f0a81d