am b959ed65: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'b959ed65':
  fix window focus race in BaseKeyListenerTest
  Clean up test files and db entries
  Ignore orientation changes during VideoViewTest
  Ignore orientation changes in EGL test activity
  ignore uiMode change as well
  reduce workload for random update into half (512MB to 256MB) as it takes too long in some devices.
  add log to check how much file system benchmarking was done before timeout
  add retry for checking logcat - 10ms sometimes is too short, and test fails - also remove file size check as it is not guaranteed.
  Fix EmojiTest threading issue.
  Adding capability request for the helper accessibility services.
  Add debug logging.
  overload network location provider with mock
  Fix for bug 8629392: Failing cts tests on MR2