Merge "Merge "Fixed an issue where a notification could become empty" into...
Merge "Merge "Fixed an issue where a notification could become empty" into pi-dev am: 68b0bb40" into pi-dev-plus-aosp
am: 1172fbff
Change-Id: Ia33277e76491510cead65ec54b87db7741a34cc9