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 am: cb5bbadb

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



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