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

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

Change-Id: I51318a7165bfc5d874fba258a2b4d876024d52cc