DO NOT MERGE - Merge ab/7272582 am: 2d66c2406b

Original change: https://android-review.googlesource.com/c/platform/hardware/st/secure_element/+/1735958

Change-Id: I6fbf595d21dfc78e84414ac79867d8cde631a842