Merge "Fixing up the encoding of the BCC" am: ba3f76657b

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

Change-Id: I78dda7264f0803909c2c51af1005816a53b7ee4f