Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is...

Merge "DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4  -s ours am: 589f83e6  -s ours am: 495aa09c  -s ours am: 10a90050  -s ours am: 03c946e0  -s ours am: c2aed112  -s ours am: a481fd31  -s ours" into nyc-mr2-dev-plus-aosp
am: 3039f42e  -s ours

Change-Id: I72ad5601778873513d3b669adbb664435daccbf1