Merge "Extend foreground service test to demonstrate doze behavior."