Merge branch 'dev_robotaxi-d_250417_8.0.0_routing' into dev_robotaxi-d_250709_8.2.0_advideo

# Conflicts:
#	OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/MusicModel.kt
#	OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt

app/build.gradle

@@ -154,7 +154,7 @@ android {
 
     apply from: "./script/roleFlavors/driver.gradle"
     apply from: "./script/roleFlavors/passenger.gradle"
-    apply from: "./script/roleFlavors/driverpassenger.gradle"
+//    apply from: "./script/roleFlavors/driverpassenger.gradle"
 
 //    apply from: "./script/flavorfilter/flavorsFilterConfig.gradle"
 

app/script/flavorfilter/flavors.json

@@ -2,7 +2,7 @@
   "mogo": {
     "C1":["driver"],
     "B1":["driver","passenger"],
-    "B2":["driver","passenger","bailing"],
+    "B2":["driver","passenger"],
     "T1T2":["driver","passenger"],
     "ALL":["driver","passenger"]
   },
@@ -20,7 +20,7 @@
   "saas": {
     "T1T2":["driver","passenger"],
     "B1":["driver","passenger"],
-    "B2":["driver","passenger","bailing"],
+    "B2":["driver","passenger"],
     "M1":["driver","passenger"],
     "ALL":["driver","passenger"]
   }