Merge "Compatibilize ShowImeWhileDismissingThemedPopupDialogTest to CF ARM" into udc-dev am: 8b5f53e9e8

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

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