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

* commit '7141267f68a7acf57cdf68055445d61b248195f4':

Change-Id: I3e4c72a5ae274102091225fdff0e20f2040c621a