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