Merge "Delete fiemap_image_test_presubmit" am: 4b3229b216 am: f0461b29d8 am: 528edca935 am: e665c0ae9e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1393701

Change-Id: I3b9fdd0f40af04c4421fbb68673eaa54855f1e08

fs_mgr/TEST_MAPPING

@@ -7,7 +7,7 @@
       "name": "liblp_test"
     },
     {
-      "name": "fiemap_image_test_presubmit"
+      "name": "fiemap_image_test"
     },
     {
       "name": "fiemap_writer_test"

fs_mgr/libfiemap/Android.bp

@@ -110,30 +110,3 @@ cc_test {
     auto_gen_config: true,
     require_root: true,
 }
-
-/* BUG(148874852) temporary test */
-cc_test {
-    name: "fiemap_image_test_presubmit",
-    cppflags: [
-        "-DSKIP_TEST_IN_PRESUBMIT",
-    ],
-    static_libs: [
-        "libcrypto_utils",
-        "libdm",
-        "libext4_utils",
-        "libfs_mgr",
-        "liblp",
-    ],
-    shared_libs: [
-        "libbase",
-        "libcrypto",
-        "libcutils",
-        "liblog",
-    ],
-    srcs: [
-        "image_test.cpp",
-    ],
-    test_suites: ["device-tests"],
-    auto_gen_config: true,
-    require_root: true,
-}