Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c41605

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655



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