[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb
-s ours am: c07555d438
-s ours am: 56c4d2a5a5
-s ours am: 045a9bfd32
-s ours am: 417c199efa
-s ours am: 0d0954c8bc
-s ours am: 4c6c18ae10
-s ours am: a66fa7c91b
-s ours am: 55f96e6177
-s ours am: 9c0a1b8e0f
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846 Change-Id: I281e282127ef2fafaa89049835be7bfd1020f521 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: