Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev am: 3ec17d31c5
am: 96efd907c5

Change-Id: I3d2ddef0b5add85130daeadc88bb907661c8d210