[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094
am: c362ee7dc2
-s ours am: a9488a71bc
-s ours am: ab11731a5b
-s ours am: 18510c531b
-s ours am: 2ebd6e63e8
-s ours am: add1702ed9
-s ours am: a2a1987f67
-s ours am: e50f7dfc5c
-s ours am: 34e3c4b8ea
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222 Change-Id: Ic8eb89b78632dc56d73187bef95fb19e3fe04534 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: