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

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

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