Merge "Sticky huns dont get cleaned up properly" into tm-dev am: aafbf457 am: 0a46c828

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

Change-Id: If3f44c6a01495c694433131cba51361592a590d1