am 6b8c7e7c: am 7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev

* commit '6b8c7e7c33fbf7d6425baf7003222b7603ac8ef5':
  Settings crashing if there are no installed accessibility services.