[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
am: 73becab672
-s ours am: 92e234f89b
-s ours am: 987348c147
-s ours am: c295e375bb
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218 Change-Id: I8aba41b7485179d0516eab3a4fba929a34512268 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: