Merge "Revert "PowerManagerService: Enable light sensor debug output"" into ics-mr0