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

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

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