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: 38c5f1fd" into qt-r1-dev-plus-aosp
am: ea1e67c4
Change-Id: I1ccc598464f8ac5314c02bdb35e543b4a05620da