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

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

Change-Id: If200ea4f5270088d891054edde99ee562162bce0