Merge "Use common Comparator."

     * The pair is the key and its associated alarm time (in the elapsed realtime timebase).

     */

    private static class AlarmPriorityQueue<Q> extends PriorityQueue<Pair<Q, Long>> {

        private static final Comparator<Pair<?, Long>> sTimeComparator =

                (o1, o2) -> Long.compare(o1.second, o2.second);

        AlarmPriorityQueue() {

            super(1, Comparator.comparingLong(o -> o.second));

            super(1, sTimeComparator);

        }

        /**