Merge "Add use of PendingIntent.getForegroundService()" into pi-dev
am: 827c8e99ee

Change-Id: I1524ab6adffdabc5171f2a35cf22208fe99db6d5