Revert "nfc: Fix build failure"

This reverts commit 94e9179c006ccad8b6ece7cadd44f96a9589b8e9.

Reason for revert: Reland with fix.

Bug: 355312096
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:26463c676c1147dd4ece9c4cc4c0281a462857b3)
Merged-In: Ibee116a3c84f3bab3dec4abe0ee8d495129bc670
Change-Id: Ibee116a3c84f3bab3dec4abe0ee8d495129bc670
4 files changed