Merge "Hard code the MAC key for remote provisioning" am: b959635bbb am: 614b181ffc

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

Change-Id: Ib825be53517a51fe5114497ccce0655f9e2e4c80