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

a051507e0a9664f3c4c9a6066741638f8177dbe5

Bug: 303286040
Test: Compiles

Change-Id: Idfacfa312a7c19a5472301cc0cae4b2276ce28df
5 files changed