[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6
am: 3c039ca648
-s ours am: 2df32f537f
-s ours am: 4e7bbcce82
-s ours am: c36d4dd62b
-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: I8b0818e26d8f4e2cc5fc410893b8cc5832c141c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: