am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong...
am edbada7a: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit 'edbada7a':
Accessibility no longer overrides strong encryption (Settings).