Merge "Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev...
Merge "Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b am: b60d029e" into nyc-mr1-dev-plus-aosp
am: 9be24cfd
* commit '9be24cfd':
Change-Id: I7c3d94aed8f24b963f40915cca7074ab98c2b144