Merge "Merge "Not showing menu buttons for any headsup notification" into...
Merge "Merge "Not showing menu buttons for any headsup notification" into qt-dev am: 7ad66d5e am: 5b7cfe70" into qt-r1-dev-plus-aosp
am: 018b51dd
Change-Id: Icc6a14bc09301b7a23ce296064b2299329df0631