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

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

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