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