[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59
am: fc05ca8c35
-s ours am: 5a4bdbb9cf
-s ours am: 800f77c404
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23541011 Change-Id: Ie5da6055722b74bfffd1798b583b5e468ca754d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: