Merge "Add setRemoteInputHistory method to NotificationCompat." into nyc-dev