am 41cf9241: am 1e64aa33: Merge "Reset rotation-lock-for-accessibility setting on upgrade." into lmp-mr1-dev automerge: e586ab7

* commit '41cf924137feb7be16f93d5f2701f2af2a74fade':
  Reset rotation-lock-for-accessibility setting on upgrade.