Merge "Make ImePerfTest wait for animation end" into sc-dev am: 28a77d5846 am: 8c6398c72d

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

Change-Id: I20dfb12a3c6b7f41e1c025e22c67dac0c3c0c719