am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest

Merge commit '8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp

* commit '8258fda17741b4969b93ffbe8796c76e427a9f27':
  Fix issue #2576268: There is no uiMode config change constant for the manifest