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: 5c60ef42 am: e108bd58 am: 864e4238

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

Change-Id: Ic833658d26fbc9e0692e7b45bdebb3a39e02412d