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

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

Change-Id: I9e19d7900ebb6870435d06aa0b32552ec784433f