Revert^2 "barbet(nfc): Modify NFC overlays for NFC apex"

6083070f5255b743b76ee1dee2d4691f536bd716

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:da7211659016203f1d3642d0aa30da982f09475d)
Merged-In: Idd6d90ec9eebc84f416a1dbeed02a0c497d9bc85
Change-Id: Idd6d90ec9eebc84f416a1dbeed02a0c497d9bc85
5 files changed