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

Merge "Fix keyboard is attached to wrong task in split" into tm-dev am: 969d1b8e am: 5d846976 am: d2fd86f6

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



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