Merge changes from topic "cherrypicker-L23200030000689269:N91700030011100373" into main

* changes:
  Revert^2 "pantah(nfc): Modify NFC overlays for NFC apex"
  Revert^2 "pantah: Replace NFC app with NFC apex"