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

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

Change-Id: Icdf1a1014ec07b37315c83ede4fcff97d2dd241b