Merge "Fix CLA byte encoded with wrong SM bit" am: 3da2113708 am: 2dd3e0965d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1937329

Change-Id: I7b7369f60d4f0d5069b11b4862f55e6b5b08db74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>