Sync up to v300.l

patches/platform_system_nfc/0001-Let-vendor-have-priority-over-NFC-config-file-rather.patch

@@ -0,0 +1,29 @@
+From ecbc25f6de3722fd9dfeaf062c1fff7c32268787 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <phh@phh.me>
+Date: Mon, 21 Dec 2020 19:36:54 +0100
+Subject: [PATCH] Let vendor have priority over NFC config file, rather than
+ GSI
+
+Thanks @mikalovtch
+
+Change-Id: Iaee468f3b8e5c8ec90ca7e856a6526d1cbcaa33e
+---
+ src/adaptation/nfc_config.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/adaptation/nfc_config.cc b/src/adaptation/nfc_config.cc
+index 264968e..9260697 100644
+--- a/src/adaptation/nfc_config.cc
++++ b/src/adaptation/nfc_config.cc
+@@ -30,7 +30,7 @@ using namespace ::android::base;
+ namespace {
+ std::string searchConfigPath(std::string file_name) {
+   const std::vector<std::string> search_path = {
+-      "/product/etc/", "/odm/etc/", "/vendor/etc/", "/system_ext/etc/", "/etc/",
++      "/odm/etc/", "/vendor/etc/", "/product/etc/", "/system_ext/etc/", "/etc/",
+   };
+   for (std::string path : search_path) {
+     path.append(file_name);
+-- 
+2.25.1
+