Merge "Add use of PendingIntent.getForegroundService()" into pi-dev