Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev