Merge "Merge "Fixed a crash with notification groups" into nyc-dev am: c152dacc am: bf11142c" into nyc-mr1-dev-plus-aosp