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

[automerger skipped] RESTRICT AUTOMERGE: Fix HMAC Compare time attack am: ca8d670c am: bc9a36a8 am: 3e2b0a15 am: 6205b89f -s ours am: c1a5571a -s ours

am skip reason: subject contains skip directive

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



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