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