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

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

Change-Id: I6e902f5a9ef58251475e7654cfc1c94bcb0b2633