Merge "Change masked_tag() return type to match BoringSSL change." am: 4d768643e9 am: 3ba4c56dca am: bd0d7148a5

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2480817

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