[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
am: 4a5e1a4d3f
am: 7e1d083e05
am: 27d2496143
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057 Change-Id: I89463761e9fa2bf9a03bd4a31c3ca810e066c4e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: