Merge "Fixing up the encoding of the BCC" am: ba3f76657b am: 41007e0b93 am: d05a55eb23 am: 6d4e7ef3ce

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

Change-Id: I17ef000803b73d10c7b328e624f011fbd302567c