Merge "Make ImePerfTest wait for animation end" into sc-dev am: 28a77d58 am: 7a61b487 am: c6af8edd

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

Change-Id: I5e078e14f59f45cb5b3f4235da33d930450cf117