RESTRICT AUTOMERGE: Fix HMAC Compare time attack am: ca8d670c16

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

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