Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am:...

Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am: 9f165ca3 am: 665796dd am: bdd7c5eb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961919

Change-Id: Ic3fbab8ee074d96b4d02ee815398e128bca180c8

cmds/incidentd/src/WorkDirectory.cpp

@@ -280,7 +280,7 @@ void ReportFile::addReport(const IncidentReportArgs& args) {
                 // Lower privacy policy (less restrictive) wins.
                 report->set_privacy_policy(args.getPrivacyPolicy());
             }
-            report->set_all_sections(report->all_sections() | args.all());
+            report->set_all_sections(report->all_sections() || args.all());
             for (int section: args.sections()) {
                 if (!has_section(*report, section)) {
                     report->add_section(section);