Merge "Merge "Fix hiding keyboard animation stuck while dialog dismissing."...

Merge "Merge "Fix hiding keyboard animation stuck while dialog dismissing." into rvc-dev am: dac09ee7 am: 7df40a82" into rvc-d1-dev-plus-aosp am: 54eda0a7

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

Change-Id: Iafeb4d747c3865d6bddc4994b2f34eaedb9adbd5