RESTRICT AUTOMERGE: Fix HMAC Compare time attack am: ca8d670c am: bc9a36a8 am: 3e2b0a15

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



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