Merge "Fix issue #65298216: DeviceIdleController needs to watch..." into oc-mr1-dev
am: 33489a9f84

Change-Id: I530697d443226d9ca0cb321b8bd9462a2e25f4e4