Merge "Merge "Fix issue #65298216: DeviceIdleController needs to watch..." into oc-mr1-dev am: 33489a9f am: a6fba5b5 -s ours"