Snap for 6582636 from 48c09a1e3d388d4bdd4cc5cfb4453bc5a48cd9f9 to rvc-release

Change-Id: I049202d0d96e8962b8af386746fc7c44578dc87c
diff --git a/src/adaptation/nfc_config.cc b/src/adaptation/nfc_config.cc
index f406847..264968e 100644
--- a/src/adaptation/nfc_config.cc
+++ b/src/adaptation/nfc_config.cc
@@ -29,9 +29,10 @@
 
 namespace {
 std::string searchConfigPath(std::string file_name) {
-  const vector<string> search_path = {"/odm/etc/", "/vendor/etc/",
-                                      "/product/etc/", "/etc/"};
-  for (string path : search_path) {
+  const std::vector<std::string> search_path = {
+      "/product/etc/", "/odm/etc/", "/vendor/etc/", "/system_ext/etc/", "/etc/",
+  };
+  for (std::string path : search_path) {
     path.append(file_name);
     struct stat file_stat;
     if (stat(path.c_str(), &file_stat) != 0) continue;