[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: 3ccc4ac6 am: d294901e am: b2f915dc -s ours

am skip reason: subject contains skip directive

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



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