tree 39e26acb372e65ef67687ff1668b0d6cc4dfc524
parent 969a955d20d6466300478483957df5d48c90d166
parent df1c63e1a178987174f5ec0a204d3bf2d541fc69
author George Chang <georgekgchang@google.com> 1628178852 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628178852 +0000

[automerger skipped] Add a timer to prevent NFCC got stuck in ActiveRW am: 303e151afa -s ours am: df1c63e1a1 -s ours

am skip reason: Merged-In Ia15e000f7ba6a482e5ca69f23cb644eaf0d7b01c with SHA-1 a65f41ad9c is already in history

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

Change-Id: Ifc30b396e178c5f8dda6b47d58b325e19a05c67d