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

Merge "Fix hiding keyboard animation stuck while dialog dismissing." into rvc-dev am: dac09ee7 am: 0a49dd38 am: 869a1892 am: 35fc2fdf

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

Change-Id: Ieaaeaaba7f061b4c651f7c0726332292872dcb99