[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
-s ours am: 14f11e845b
-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: I840417aa2a6033b66b08c2281e31d12410b0fbbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: