Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev am: 5f6aee1cf7
am: 5cf04e89a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17197594 Change-Id: I8869806a8220157c5c74b946f2935bb313f1aa87
This commit is contained in: