[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 2d66c2406b am: 0b3a26658c am: c9cfd354b9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I40d5727bede3c90856b48d96e3230b6fa4d5b35c