am 4ca6659f: Merge change 8565 into donut

Merge commit '4ca6659fe4c8299f886eba7f745bed509be8126b'

* commit '4ca6659fe4c8299f886eba7f745bed509be8126b':
  Fixing bug 2003639 - this is a fix to prevent the AccessibilityManagerService