am 03be4d9c: am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1

* commit '03be4d9cf456b7ad82e6fbbdea2b4902cb0e4abb':
  Make the dock orientation override the HDMI orientation.