Merge "De-flake testImeAnimationCallbacksShowAndHide" into udc-dev am: b33119d3 am: 8c628ba4 am: 749e0968 am: 9d862f36

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



Change-Id: Idf636d18664d9d0a9ad4fcdea0208d75b41098f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>