Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"