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

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