tree 3711d80f7c7c0f6daf73af4a78484747c6ee73f5
parent 578e2aaed5ce0aea80ee187639d2affb906217fd
parent 1d403f39708219d0ecb06b90598dc4a4e33f7573
author Xin Li <delphij@google.com> 1633679781 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679781 +0000

[automerger skipped] Merge Android 12 am: f4be0e805a -s ours am: dd8ff009e4 -s ours am: 1d403f3970 -s ours

am skip reason: Merged-In I3a661bed1ae2ee68896f860d7f694ac67bbb9475 with SHA-1 8fd5536b7d is already in history

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

Change-Id: I2d08d5e11ff22090e9ec4b1377bb22bf79a2e971