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

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

Change-Id: Id25164f0aa93b9604c45b8fbfd944014e6ee5fd8