Merge "Change clock used for wakelock tracing" into main

        @Override

        public long nanoTime() {

            return System.nanoTime();

            // This must be time since boot including suspend for Perfetto.

            return SystemClock.elapsedRealtimeNanos();

        }

        @Override