[automerger skipped] Merge "Keymaster: Fix potential bug in...

[automerger skipped] Merge "Keymaster: Fix potential bug in extractUint32()/extractUint64()" into rvc-dev am: 32cbc59c am: b8f10886 -s ours am: 65a1fcb7 -s ours am: b17c0842 -s ours

am skip reason: Change-Id Ie0d2c0127cc34f1bb90455e4f7869e15e5542173 with SHA-1 4feb8cd2 is in history

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

Change-Id: I41b0984bad737ee8c36d0d09268fa2f4cc7726eb