Merge "Treat fg service alarms like bg service alarms under FAS" into pi-dev