[automerger skipped] Merge "Enable forced focus for resumed split screen...

[automerger skipped] Merge "Enable forced focus for resumed split screen activities" into tm-qpr-dev am: f1fc4e77 am: ca58c605 -s ours

am skip reason: Merged-In I5675b32fbb9f60a7373fadbce379d571168436e7 with SHA-1 f2a91a3d is already in history

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



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