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