Merge b9e509cba1691d24d8cc06625eff4e1ee25eee51 on remote branch

Change-Id: I94f8c8d863c85ecc86a0f9051af4660119cc3174
diff --git a/services/config/src/device_impl.cpp b/services/config/src/device_impl.cpp
index 4541368..2361ab0 100644
--- a/services/config/src/device_impl.cpp
+++ b/services/config/src/device_impl.cpp
@@ -85,6 +85,7 @@
     android::status_t status = device_obj_->IDisplayConfig::registerAsService();
     // Unable to start Display Config 2.0 service. Fail Init.
     if (status != android::OK) {
+      delete device_obj_;
       device_obj_ = nullptr;
       return -1;
     }