Merge "Breaking out mac key signing into the context" am: feb7a62bcd am: 752cff5834 am: 294b9bdc31

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

Change-Id: I6e22f25243f4c1d368b5512920207e945e7abde6