am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev

* commit '154bb5597cbd3985e3ab86647c5feaa2e289e1a9':
  Fix PhoneWindowManager#getUserRotationMode