Merge "Fix disappearing HUN when drag down from heads up" into rvc-dev am:...

Merge "Fix disappearing HUN when drag down from heads up" into rvc-dev am: 1ef59a81 am: 58d33353 am: 3b089dff am: 9596ac58

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11901358

Change-Id: Ie532075624abe539693e8c06ec80ee984acffd81