[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767
-s ours am: 30ea3d3cec
-s ours am: 38280de428
-s ours am: 3daa00eee5
-s ours am: 74b860fbf2
-s ours am: c7034457f5
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760 Change-Id: I8c3cd8571eec1a97bd38b03134d9ee45cfdfb8b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: