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

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



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