Merge "De-flake testImeAnimationCallbacksShowAndHide" into udc-dev am: b33119d3

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



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