Merge \"Wakelock timeout for AnyMotionDetector. Bug: 29959125\" into nyc-mr1-dev
am: 33759a993d

Change-Id: I9ca9b5835b0fbddca4447fcb8e6fc606880bf69e