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

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

Change-Id: I55ee2295c2f46913dcbf8588c62c9e156fcdcd4c