Merge "Revert "Moves get/setAllowGeneratedReplies to NotificationCompat.Action"" into nyc-dev