[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 74d171f97f -s ours am: e007e199bd -s ours

am skip reason: Merged-In I489725b9da3f9e3eb47012073f9a72b2fbce50ba with SHA-1 9f2f27d428 is already in history

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

Change-Id: I3d528c2feba9e0fb0fb17c7570340f3fe08586e1