Merge "Compatibilize CloseImeOnDismissPopupDialogTest to CF ARM" into udc-dev am: 477d692a am: 15bbccc9

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



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