Merge "Include ServiceRecord in foreground service exception exception text." into pi-dev