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

Change-Id: I3042ba6345b5b88aa0b95abc8c81dc45ae6be550