Merge "Keymaster: Fix potential bug in extractUint32()/extractUint64()" am: 991650fd8a am: e9e59bd5d1 am: 955aa4ecc6 am: 408f803e7c am: fb8d949ba3

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

Change-Id: Ifa4c635f0e7dc615f8811ffcc2c2cb3323d9867c