tree 3711d80f7c7c0f6daf73af4a78484747c6ee73f5
parent 8fd5536b7d00e9270bc252afe1f65b87da91c434
parent f4be0e805aa59e7220eb2c101dc337f05e4ec60a
author Xin Li <delphij@google.com> 1633655980 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655980 +0000

[automerger skipped] Merge Android 12 am: f4be0e805a -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: Ibcf3c5497e0c93b8eb9200099d933f2a9f858129