Merge "Changing the ordering for heads up notifications" into mnc-dr-dev

        @Override

        public int compareTo(HeadsUpEntry o) {

            boolean selfFullscreen = hasFullScreenIntent(entry);

            boolean otherFullscreen = hasFullScreenIntent(o.entry);

            if (selfFullscreen && !otherFullscreen) {

                return -1;

            } else if (!selfFullscreen && otherFullscreen) {

                return 1;

            }

            return postTime < o.postTime ? 1

                    : postTime == o.postTime ? entry.key.compareTo(o.entry.key)

                            : -1;