am cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev

* commit 'cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
  Accessibility no longer overrides strong encryption.