Merge "De-flake testImeAnimationCallbacksShowAndHide" into udc-dev am: b33119d3 am: 8c628ba4 am: de0ffb10 am: 961a956e

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



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