Merge "BatteryStatsService: Allow unknown wakeup string"