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

Change-Id: I9a3a0d8e9fa348018a36c1e306aab822df377aa0