Merge "Match CF ARM and regular IME test name" into udc-dev am: 28b2efa8 am: 57330bf8

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



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