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: 3a5cfdbd am: aeb718a4

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



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