[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846 Change-Id: Ia8afb7481bba98817cf53f3ec0ee1d226722aae5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: