Merge "Merge "Revert "Moves get/setAllowGeneratedReplies to NotificationCompat.Action"" into nyc-dev am: 398a6b2 am: 8ce77b8" into nyc-mr1-dev-plus-aosp