Merge "Fix testGlobalActions_doesntStealImeControl" into rvc-dev am: ccd0d1e05d

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

Change-Id: I04c914a6908565636b694aca0b0db1d8f7387727