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

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