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

[automerger skipped] Merge "Keymaster: Fix potential bug in extractUint32()/extractUint64()" into rvc-dev am: 32cbc59c -s ours am: 1ff45345 -s ours am: dda6b188 -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: I07b3735331f1cc2359a96aa38784c04dc2966cb3