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

Merge "Merge "Fix testGlobalActions_doesntStealImeControl" into rvc-dev am: ccd0d1e0 am: 5898a771" into rvc-d1-dev-plus-aosp am: 17541fb4

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

Change-Id: I92bee04a67df5528bd359aef7e36de410ede4327