Merge "Merge "No need to use getExpandedBubble for singleTaskDisplayDrawn/Empty callbacks" into qt-qpr1-dev am: 4ac6a113ed" into qt-qpr1-dev-plus-aosp
am: 834dad1f5b

Change-Id: If679e7fc579a43ce12b68bd742e6ece9da031e3d