[merge to m59]md settings: Fix dialog buttons on lock screen.

chrome/browser/resources/settings/people_page/password_prompt_dialog.html

Index: chrome/browser/resources/settings/people_page/password_prompt_dialog.html
diff --git a/chrome/browser/resources/settings/people_page/password_prompt_dialog.html b/chrome/browser/resources/settings/people_page/password_prompt_dialog.html
index ec6969c7ca6dc1d8d1cce456e39438ea89834df3..2f0216581bdf43650eaa2b22081c31ee171e1295 100644
--- a/chrome/browser/resources/settings/people_page/password_prompt_dialog.html
+++ b/chrome/browser/resources/settings/people_page/password_prompt_dialog.html
@@ -33,18 +33,16 @@
                      error-message="$i18n{passwordPromptInvalidPassword}"
                      aria-disabled="false">
         </paper-input>
+      </div>
+      <div class="button-container">
+        <paper-button class="cancel-button" on-tap="onCancelTap_">
+          $i18n{cancel}
+        </paper-button>
 
-        <div class="button-strip">
-          <paper-button class="cancel-button" on-tap="onCancelTap_">
-            $i18n{cancel}
-          </paper-button>
-
-          <paper-button class="action-button" on-tap="submitPassword_"
-                        disabled$="[[!enableConfirm_(password_,
-                                                     passwordInvalid_)]]">
-            $i18n{confirm}
-          </paper-button>
-        </div>
+        <paper-button class="action-button" on-tap="submitPassword_"
+            disabled$="[[!enableConfirm_(password_, passwordInvalid_)]]">
+          $i18n{confirm}
+        </paper-button>
       </div>
     </dialog>
   </template>