[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 skip reason: Change-Id Ie0d2c0127cc34f1bb90455e4f7869e15e5542173 with SHA-1 c96b1fab is in history

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

Change-Id: I7afc26777e7a0392c6717782a67b89d412ea12b0