Merge "Merge "Fix keyboard is attached to wrong task in split" into tm-dev am:...

Merge "Merge "Fix keyboard is attached to wrong task in split" into tm-dev am: 969d1b8e am: 5d846976" into tm-d1-dev-plus-aosp am: 008df30b am: beb627f9

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



Change-Id: I959b1e5d47fae73d4ca2f2f60d714609e0e30625
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>