[automerger skipped] Merge "Revert^2 "sunfish(nfc): Modify NFC overlays for NFC apex"" into main am: 13abc9695d am: 7801f47575 am: f818552201 -s ours

am skip reason: Merged-In I9028f8eae1d973d0f9b7553a6adf9525b56766c9 with SHA-1 34acb968a5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/sunfish/+/2863088

Change-Id: Id2dedc0d627b894f103c818d12f74a429252fe0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: e8d074f11bf64932cac3f88d88d5db04c84f918a
  1. audio/
  2. bootctrl/
  3. displayconfig/
  4. dumpstate/
  5. factory-images/
  6. gpt-utils/
  7. health/
  8. json-c/
  9. keymaster/
  10. nfc/
  11. overlay/
  12. overlay_packages/
  13. pixelstats/
  14. powerstats/
  15. rro_overlays/
  16. seccomp_policy/
  17. self-extractors/
  18. sunfish/
  19. thermal-engine/
  20. usb/
  21. vibrator/
  22. voice_processing/
  23. .clang-format
  24. Android.bp
  25. AndroidProducts.mk
  26. aosp_sunfish.mk
  27. aosp_sunfish_hwasan.mk
  28. audio_policy_configuration.xml
  29. audio_policy_configuration_a2dp_offload_disabled.xml
  30. audio_policy_configuration_bluetooth_legacy_hal.xml
  31. audio_policy_volumes.xml
  32. bluetooth_hearing_aid_audio_policy_configuration.xml
  33. bluetooth_power_limits_sunfish.csv
  34. board-info.txt
  35. BoardConfig-common.mk
  36. CleanSpec.mk
  37. compatibility_matrix.xml
  38. component-overrides.xml
  39. config.fs
  40. default-permissions.xml
  41. device-common.mk
  42. device-sunfish.mk
  43. device.mk
  44. device_framework_matrix_product.xml
  45. fingerprint.mk
  46. fstab.hardware
  47. fstab.persist
  48. fstab.postinstall
  49. gps.conf
  50. init.diagdebug.rc.userdebug
  51. init.hardware.diag.rc.user
  52. init.hardware.diag.rc.userdebug
  53. init.hardware.ipa.rc.userdebug
  54. init.hardware.mpssrfs.rc.user
  55. init.hardware.mpssrfs.rc.userdebug
  56. init.hardware.power_debug.rc.userdebug
  57. init.hardware.rc
  58. init.hardware.usb.rc
  59. init.hardware.userdebug.rc.userdebug
  60. init.insmod.sh
  61. init.insmod.sunfish.cfg
  62. init.logging.rc
  63. init.mdm.sh
  64. init.msm.usb.configfs.rc
  65. init.power.rc
  66. init.qcom.modem_links.sh
  67. init.qcom.usb.rc
  68. init.qcom.usb.sh
  69. init.qti.getbootdevice.sh
  70. init.qti.qseecomd.sh
  71. init.radio.sh
  72. init.ramoops.sh
  73. init.recovery.device.rc
  74. init.sensors.sh
  75. manifest.xml
  76. media_codecs.xml
  77. media_codecs_omx.xml
  78. media_codecs_performance_c2.xml
  79. media_profiles.xml
  80. media_profiles_V1_0.xml
  81. METADATA
  82. p2p_supplicant_overlay.conf
  83. powerhint.json
  84. product.prop
  85. recovery.wipe
  86. sec_config
  87. sensors.hals.conf
  88. task_profiles.json
  89. thermal-engine-sunfish.conf
  90. thermal_info_config_sunfish.json
  91. ueventd.rc
  92. uinput-fpc.idc
  93. uinput-fpc.kl
  94. utils.mk
  95. WCNSS_qcom_cfg.ini
  96. wifi_concurrency_cfg.txt
  97. wpa_supplicant_overlay.conf
  98. wpa_supplicant_wcn.conf