diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c858576a28b7fb248914887fef4f76cb2ec4881a
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+stages:
+  - auto-merge-main
+  - update-from-upstream
+
+include:
+  - project: 'e/templates'
+    ref: master
+    file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml'
+  - project: 'e/templates'
+    ref: master
+    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
+
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 5b76bb0c0f64d15d0cc01e5f2fb6aace941f0ba8..06244accf87e286499e29799a6bc15eb815757cc 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -121,6 +121,7 @@ cc_library {
     name: "libcameraservice",
 
     defaults: [
+        "camera_expose_clientpkgname_defaults",
         "libcameraservice_deps",
     ],
     // Camera service source
@@ -235,6 +236,10 @@ cc_library_static {
     name: "libcameraservice_device_independent",
     host_supported: true,
 
+    defaults: [
+        "camera_expose_clientpkgname_defaults",
+    ],
+
     // Camera service source
 
     srcs: [
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 2d55f39b2550d47995254056ee77fcb8f6a78406..8db85cf2d7c2b648c02c2f4d360fd02ee5a77616 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -86,6 +86,10 @@
 #include "utils/CameraServiceProxyWrapper.h"
 #include "utils/SessionConfigurationUtils.h"
 
+#ifdef TARGET_CAMERA_EXPOSE_CLIENTPKGNAME
+#define PROPERTY_CAMERA_PACKAGENAME     "debug.camera.packagename"
+#endif
+
 namespace {
     const char* kPermissionServiceName = "permission";
     const char* kActivityServiceName = "activity";
@@ -2486,6 +2490,9 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const std::str
 
     int originalClientPid = 0;
 
+#ifdef TARGET_CAMERA_EXPOSE_CLIENTPKGNAME
+    property_set(PROPERTY_CAMERA_PACKAGENAME, clientPackageName.c_str());
+#endif
     int packagePid = (clientPid == USE_CALLING_PID) ?
         CameraThreadState::getCallingPid() : clientPid;
     ALOGI("CameraService::connect call (PID %d \"%s\", camera ID %s) and "