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

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

Change-Id: I2220228af1335dd43d311e586d9f8eac8785c6e7