Merge "Handle cancelled Insets animation" into rvc-qpr-dev am: e272df9338 am: 99813602c0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I556713d0fa14ab0f794eab49ac6c16b5354ed647