[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 am: 02d114d3 -s ours am: eb8d24f0 -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: I6218c087c461cf1bb8178130b8f2d448f90b8e25