[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack"...

[automerger skipped] Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack" into tm-dev am: b3191a4a am: 82582195 -s ours am: c9c26474 -s ours am: bd43d49f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21804206



Change-Id: Ied368904e1b43a0a4b66bf5bcf19922249602a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>