Merge "Follow-up on bug #65298216: DeviceIdleController needs to..." into oc-mr1-dev
am: c558a8c402

Change-Id: I0c68639d432760ef4f3d8125e9d39789fd4fc613