Remove double filename logging am: b86f89cc81

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2525821

Change-Id: I14e347bee47c61499d6b953d3ede6e773c453b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/aosp/logging_android.cc b/aosp/logging_android.cc
index 8b5465a..5940f78 100644
--- a/aosp/logging_android.cc
+++ b/aosp/logging_android.cc
@@ -265,7 +265,7 @@
   } else {
     // This will eventually be redirected to CombinedLogger.
     // Use nullptr as tag so that liblog infers log tag from getprogname().
-    if (file == nullptr || file[0] == 0 || line == 0) {
+    if (file == nullptr || file[0] == 0 || line == 0 || message_start != 0) {
       __android_log_write(priority, nullptr /* tag */, str.c_str());
     } else {
       __android_log_print(priority,