Merge "Skip indexing content while user is locked." into nyc-dev am: c416433a9e
am: 4061fd1ddd

* commit '4061fd1ddd10cb689ae40ef62dd2544093f264fa':
  Skip indexing content while user is locked.

Change-Id: I3a6889d91de679709918a3a9367e8e4054a809a9