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 am: 142ec05f

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

Change-Id: I3c5cb71e91195b1dc043a01d5c485ddfdbf87a6d