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

Change-Id: I72def5a02d2d5895e73b141b7c6487f03e2e6781