am 96de4c3b: am da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1

* commit '96de4c3befe7cefac81b1d317f752ba76b9fe7ce':
  TalkBack does not announce properly the buttons of the PIN lock.