Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev
am: 18e9f13b24

* commit '18e9f13b24867fb4a41391c5512376db413449a8':
  Don't disrupt a11y state when user is unlocked.

Change-Id: I03a057fb4278466250395958252a349d4dfe2e3c