[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
-s ours am: faa7a8af3d
-s ours am: f87cff76ff
-s ours am: 58c1caf910
-s ours am: 2e44e7c58c
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218 Change-Id: Id20f154194c7efd2141e4d3b764c6d2a161325e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: