Merge "Merge "Fix hiding keyboard animation stuck while dialog dismissing." into rvc-dev am: dac09ee7 am: 7df40a82 am: f9ea2989" into rvc-qpr-dev-plus-aosp am: 55980f95

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

Change-Id: I41fd7e605766db55de629bd21f554130ac96a5e0