Settings: Display: Orientation disable merge fix

Bug: 619295
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I598f3f1fa39e93c5b252f831d7d59c189e91feee
Reviewed-on: https://chromium-review.googlesource.com/677886Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503635}

chrome/browser/resources/settings/device_page/display.html

@@ -157,7 +157,7 @@
           </div>
           <div class="md-select-wrapper">
             <select class="md-select" value="[[selectedDisplay.rotation]]"
-                disabled="[[!enableSetOrientation_(selectedDisplay)]]"
+                disabled="[[selectedDisplay.hasAccelerometerSupport]]"
                 aria-labelledby="displayOrientation"
                 on-change="onOrientationChange_">
               <option value="0">$i18n{displayOrientationStandard}</option>