am 246a283c: am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"

# By Sangkyu Lee
# Via Android Git Automerger (1) and others
* commit '246a283c007e007181f8892df514dfe04121b7a5':
  Fix unexpected rotation change when re-enabling auto-rotate