Merge "Merge "Fixed an issue where the notification wouldn't collapse" into qt-dev am: 8ba52400f5 am: a4ca52d297" into qt-r1-dev-plus-aosp am: a080e876e2
am: 25315b883d

Change-Id: Ieac442187b341e15a776639ba91d7c0e6d26d37e