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

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

Change-Id: I00963055935ca7e18bdaf45ebf784d88316bb4a3