Merge "fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec  -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435 am: 7af83d0e5a" into nyc-mr2-dev-plus-aosp