[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583
-s ours am: a8bd8948d1
-s ours am: 02ef9c46ec
-s ours am: 7fa313e00e
-s ours am: c2fd42d3ec
-s ours am: 1e57ae6ebc
-s ours am: 4f99150a82
-s ours am: fdb90e838f
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250 Change-Id: I1650daf317521f5ebc98709c4c58fe319e300031 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: