Merge "Wakelock timeout for AnyMotionDetector. Bug: 29959125" into nyc-mr1-dev