Merge Prevent DisplayPreferences from saving incorrect rotations.

ash/system/audio/tray_audio.cc

Index: ash/system/audio/tray_audio.cc
diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc
index 21c2163c4d5606e2b2d098259490b23748710ede..7260fc01fe82e371a1093413c1b8b1e54fdbb19c 100644
--- a/ash/system/audio/tray_audio.cc
+++ b/ash/system/audio/tray_audio.cc
@@ -167,7 +167,7 @@ void TrayAudio::ChangeInternalSpeakerChannelMode() {
     const DisplayInfo& display_info =
         Shell::GetInstance()->display_manager()->GetDisplayInfo(
             gfx::Display::InternalDisplayId());
-    if (display_info.rotation() == gfx::Display::ROTATE_180)
+    if (display_info.GetActiveRotation() == gfx::Display::ROTATE_180)
       channel_mode = system::TrayAudioDelegate::LEFT_RIGHT_SWAPPED;
   }