[Custom Tabs] Make location bar always anchor left

chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
index 31e59ce75d044eb4215c3300837d9177c007c967..b2b35807fb94e7f7861a89920a3eeefef0565a59 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java
@@ -464,10 +464,14 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
             mLocationBarFrameLayout.setLayoutParams(urlLayoutParams);
         }
 
-        // Set left margin of mTitleUrlContainer here to make sure the security icon is always
+        // Update left margin of mTitleUrlContainer here to make sure the security icon is always
         // placed left of the urlbar.
         LayoutParams lp = (LayoutParams) mTitleUrlContainer.getLayoutParams();
-        lp.leftMargin = mSecurityButton.getMeasuredWidth();
+        if (mSecurityButton.getVisibility() == View.GONE) {
+            lp.leftMargin = 0;
+        } else {
+            lp.leftMargin = mSecurityButton.getMeasuredWidth();
+        }
         mTitleUrlContainer.setLayoutParams(lp);
     }