am 3280e89e: Merge "Fix for CTS testScreenConfiguration" into gingerbread

* commit '3280e89e3c8a327cf119a339412bef22512ca550':
  Fix for CTS testScreenConfiguration