[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: ebe5235c23
-s ours am: b24681d7d7
-s ours am: 02086812ed
-s ours am: c0df6e81a6
-s ours am: 0224f56ecb
-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: I9ec6d43add5b1a19e827706f29b1393d3d573602 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: