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

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



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