Merge "Revert "Moves get/setAllowGeneratedReplies to NotificationCompat.Action"" into nyc-dev
am: 398a6b2

* commit '398a6b256ecd2a989868d7796ba6823c6fddf76a':
  Revert "Moves get/setAllowGeneratedReplies to NotificationCompat.Action"

Change-Id: I1935af017f2447b4615fcb6b51cb5044c8593723