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