Merge "Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 6d2e1e45f0" into nyc-mr1-dev-plus-aosp