Merge "Merge "Fix disappearing HUN when drag down from heads up" into rvc-dev am: 1ef59a81 am: 58d33353 am: 48c0f4d1" into rvc-qpr-dev-plus-aosp am: b6b215f2

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

Change-Id: Ifd4e2e6003aac5a18fdc13e3b7e303774c8db444