am 6f444425: Merge "Make FLAG_AUTO_CORRECTION public" into ics-mr1

* commit '6f444425fe1bb62e12973c5df6a3161bc2aa2ce7':
  Make FLAG_AUTO_CORRECTION public