RESTRICT AUTOMERGE: Fix HMAC Compare time attack am: ca8d670c16 am: bc9a36a8be

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

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