Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: fe8604e7e8

Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2818132

Change-Id: I885d6bc28cee9a099f0f65a4d571c78b0bc6e141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

device-lynx.mk

@@ -80,8 +80,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
 	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayLynx
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \

rro_overlays/NfcOverlay/Android.bp

@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_lynx_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayLynx",
-    sdk_version: "current",
-    product_specific: true
-}

rro_overlays/NfcOverlay/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>

rro_overlays/NfcOverlay/OWNERS

@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS