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

Change-Id: I348ec6111c4edc79fa9bbab919b22a3eb0ca3e24