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

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

Change-Id: I405014428c53cc09a4dd733de7d6a5a9fc2e9b94