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

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

Change-Id: Ifb080d882a99f878b87d1aae6ab6399da634a302