Merge "Fixed a bug where the headsup would be stuck disappearing am:...
Merge "Fixed a bug where the headsup would be stuck disappearing am: a4155bb7 am: c52edb4f am: b35ae808 am: a17beb78" into nyc-mr1-dev-plus-aosp
am: 6833b79b
Change-Id: I2d50f975c5bb91de2c2af785c0c74250e9facca1