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

* commit '239fe4be850a8e9001485aa98a1c5e14efa7c5c8':
  Revert "Moves get/setAllowGeneratedReplies to NotificationCompat.Action"

Change-Id: I4e91f8683be5b552446190ff33d0635439bc9550