Merge "Route KernelWakelockReader's userspace native wakelock stats collection to SystemSuspend (ISuspendControl::getWakeLockStats())" am: a1cae83560
am: 05b194e058

Change-Id: If9203ea35fec2469561e623da907b8db922f34eb