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

    private final BroadcastReceiver mInteractivityReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            synchronized (DeviceIdleController.this) {

                updateInteractivityLocked();

            }

        }

    };

    private final class MotionListener extends TriggerEventListener