Snap for 7266504 from 99f55435043ed65d37d60b62b01f5d3c6aedc1a7 to mainline-captiveportallogin-release

Change-Id: I8aadd8c730eac6e3d3340b17a5baccccf32fec36
diff --git a/libraries/compatibility-common-util/src/com/android/compatibility/common/util/CrashUtils.java b/libraries/compatibility-common-util/src/com/android/compatibility/common/util/CrashUtils.java
index c902145..9bd1c61 100644
--- a/libraries/compatibility-common-util/src/com/android/compatibility/common/util/CrashUtils.java
+++ b/libraries/compatibility-common-util/src/com/android/compatibility/common/util/CrashUtils.java
@@ -243,7 +243,7 @@
             minCrashAddress = MIN_CRASH_ADDR;
             setSignals(SIGSEGV, SIGBUS);
             abortMessageIncludes = new ArrayList<>();
-            setAbortMessageExcludes("CHECK_");
+            setAbortMessageExcludes("CHECK_", "CANNOT LINK EXECUTABLE");
             processPatterns = new ArrayList();
         }
 
diff --git a/tests/functional/devicehealthchecks/assets/bug_map b/tests/functional/devicehealthchecks/assets/bug_map
index 1448d8d..27877ff 100644
--- a/tests/functional/devicehealthchecks/assets/bug_map
+++ b/tests/functional/devicehealthchecks/assets/bug_map
@@ -20,3 +20,4 @@
 SYSTEM_TOMBSTONE android.hardware.vibrator-service.drv2624 151884322
 SYSTEM_TOMBSTONE /vendor/bin/hw/android.hardware.gnss@1.0-service-qti 129282808
 SYSTEM_TOMBSTONE /system/product/priv-app/SafetyHubLprPrebuilt/SafetyHubLprPrebuilt.apk 158504050
+SYSTEM_TOMBSTONE AsyncTask\s+#1\s+>>>\s+com.android.nfc\s+<<<[\S\s]*nfc_main_handle_hal_evt 179110580