Merge "Merge "Fixed a flicker of group notifications" into oc-dev am:...
Merge "Merge "Fixed a flicker of group notifications" into oc-dev am: beba1bf9 am: 33496489" into oc-dr1-dev-plus-aosp
am: 06cc1610
Change-Id: Ie59e7e534932951ff466270cb30abebf683fb9cf