[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: 675b4b3c62
-s ours am: d4f7fcb409
-s ours am: 3951ac910c
-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: Ie256b037f9b3cb8325af1e70e65336cc93dccdba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: