[automerger skipped] Delegate some MAC operations to the provisioning context am: 23590680da am: f480017075 -s ours

am skip reason: Merged-In Id9a04ee0e0b1abc11d616ef53f41569cdaae3182 with SHA-1 d24ea20bce is already in history

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

Change-Id: I0095b92e1c1f4f82404fa4ffdafc8ff0231d30fa