[automerger skipped] Merge "Generate COSE MAC with a callback, not raw key" am: 29159c728f am: 8d360f3259 -s ours

am skip reason: Merged-In Ia8a0410408fe3064e904c5282b52f172f8134b9a with SHA-1 7735ba5ea9 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1691072

Change-Id: I85abf695f498efb9136ad5e3018e42eb9e3490e1