[automerger skipped] Fix ActivityNotFoundException am: 97bff3903d am: 9bc0665611 am: bd8679e903 -s ours

am skip reason: Change-Id I48bb7618ee9f97597f79fd124aca1f36bcba9f07 with SHA-1 97bff3903d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/11590430

Change-Id: Ib57f3c361c321649409872d5146561547f5f6032