Merge "Merge "Fixing crash in SysUI due to invalid group." into nyc-dev am: 814358a24f am: c1434b4559" into nyc-mr1-dev-plus-aosp
am: 626e587b56
* commit '626e587b5609c003d1683395fd9fa795f20a750b':
Change-Id: I4720100aec18ed22cb18ac21a6bc17fafafc9e72
This commit is contained in: