Merge "Fix issue #27317952: PendingIntent.getIntent() should be protected" into nyc-dev