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

* commit 'a592e55e5ff8e7b4e799745f076888e6bbbcdf55':

Change-Id: Ie64ecbe217deec122560d62b94816c92e5970301