Merge "Add a test for instant apps running a foreground service"