Merge "Make ImePerfTest#testShowImeCold more accurate" into udc-dev am: 1d4c9421 am: 643e856e

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



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