Merge "Add CTS tests for PendingIntent.getForegroundService()" into oc-dev