Merge "Show device admin warning dialog if force stop is not allowed" into sc-dev am: dc07fe1ad1
am: cb6334ba99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15179293 Change-Id: If0e07bf42325ace605b2e0ae70919c286d8d6d9b
This commit is contained in: