am 0b93d86b: am 1dade011: am 7ddc3cec: Merge "Reorder config.xml constants related to auto-rotation." into klp-modular-dev

* commit '0b93d86bf4ab4a0ff2606af881d8bf4aaa8ce9b2':
  Reorder config.xml constants related to auto-rotation.