[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 45e2c72877
am: 24d2af03ad
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545061 Change-Id: I72888efe4fb55b0df05d19b85df787cf98e914f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: