Merge "Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e
am: 5cea4fc4a1" into tm-d1-dev-plus-aosp am: 1f2cc00083
am: db476f23be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655 Change-Id: I76a1292736ac7174afb37e30e1e4f54e007fd46c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: