Merge "Create the PendingIntent for UserHandle.CURRENT" into rvc-dev