Merge branch 'dev_robotaxi-d_231205_6.2.6' into dev_robotaxi-d_231218_6.2.6

# Conflicts:
#	OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java

OCH/shuttle/driver/build.gradle

@@ -58,8 +58,8 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxrecyclerview
     compileOnly rootProject.ext.dependencies.recyclerviewadapterhelper
 
-    implementation project(":OCH:mogo-och-common-module")
-    implementation project(":OCH:mogo-och-data")
+    implementation project(":OCH:common:common")
+    implementation project(":OCH:common:data")
     compileOnly project(":libraries:mogo-map")
 
 }