Merge "Merge "Fixed a crash with the headsUpManager" into qt-dev am: fcd42e9249 am: 708890baf1" into qt-r1-dev-plus-aosp
am: 3522f4bdbe

Change-Id: I36ccedceb5539f5daf2e9b706678461ba2b0d46f